Poprawilem spece do nowej wersji psi-pedrito i klibido, proszę o sprawdzenie i
ewentualne wrzucenie. Jezeli cos jest nie tak to krzyczcie!
klibido.spec
- Update do wersji 0.2.4.1
- BR db-cxx-devel <= 4.3 (na 4.4 juz nie działa)
- Poprawki do gcc4
psi.spec - Branch:PEDRTO
- Update do wersji 2006-02-03
- poprawka do gcc4
- drugi patch zmienia ścieżkę do DATADIR z /usr/local/share/psi
na /usr/share/psi
--
Pozdr.
B.
GG:2582353 || hoganx[at]gmail.com || Linux registered user nr 406004
--- klibido.spec.org 2006-02-07 20:18:50.000000000 +0100
+++ klibido.spec 2006-02-07 19:43:38.000000000 +0100
@@ -2,16 +2,17 @@
Summary: KLibido - KDE Linux Binaries Downloader
Summary(pl): KLibido - narzędzie do ściągania binariów dla KDE
Name: klibido
-Version: 0.2.4
+Version: 0.2.4.1
Release: 1
License: GPL
Group: X11/Applications
Source0: http://dl.sourceforge.net/klibido/%{name}-%{version}.tar.gz
-# Source0-md5: 36c39623eba87684ae377a1dce9f5599
+# Source0-md5: 111a6e714509d0619a0b29e20a4ded65
+Patch0: %{name}-0.2.4-gcc4.patch
URL: http://klibido.sourceforge.net/
BuildRequires: autoconf
BuildRequires: automake
-BuildRequires: db-cxx-devel
+BuildRequires: db-cxx-devel <= 4.3
BuildRequires: kdelibs-devel >= 9:3.2.0
BuildRequires: rpmbuild(macros) >= 1.129
BuildRequires: uudeview-devel
@@ -26,7 +27,8 @@
%prep
%setup -q
-
+%patch0 -p0
+
%build
cp -f /usr/share/automake/config.sub admin
%{__make} -f admin/Makefile.common cvs
--- src/yydecoder.h.org 2005-03-09 12:18:55.000000000 +0100
+++ src/yydecoder.h 2006-02-07 17:51:19.000000000 +0100
@@ -87,7 +87,7 @@
private:
- inline void yyDecoder::charCRC(const unsigned char *c);
+ inline void charCRC(const unsigned char *c);
QStringList m_fileParts;
QStringList::Iterator fileIterator;
--- src/nntpthreadsocket.h.org 2005-09-03 15:45:46.000000000 +0200
+++ src/nntpthreadsocket.h 2006-02-07 17:54:53.000000000 +0100
@@ -234,7 +234,7 @@
bool getHead(QString group, int artnum); //Unimplemented
int m_getError() {return error;}
const char *m_getErrorDesc() {return (const char *) errorString;}
- char * NntpThreadSocket::m_findEndLine( char * start, char * end );
+ char * m_findEndLine( char * start, char * end );
void setHost(NntpHost *nh);
bool m_sendCmd( QString& cmd, int response );
QTime prevTime, currentTime;
--- src/common.cpp.org 2006-02-11 00:52:12.000000000 +0100
+++ src/common.cpp 2006-02-11 00:56:17.000000000 +0100
@@ -35,7 +35,7 @@
#endif
#ifndef PSI_DATADIR
-#define PSI_DATADIR "/usr/local/share/psi"
+#define PSI_DATADIR "/usr/share/psi"
#endif
#include<qregexp.h>
--- src/adhoc_fileserver.h.org 2006-01-18 00:48:36.000000000 +0100
+++ src/adhoc_fileserver.h 2006-02-10 20:30:50.000000000 +0100
@@ -36,7 +36,7 @@
virtual QString name() const { return QString(QObject::tr("Get list of shared files")); }
virtual AHCommand execute(const AHCommand& c, const Jid&);
- bool AHFileServer::ACL_check(QStringList ACL, const Jid& j) const;
+ bool ACL_check(QStringList ACL, const Jid& j) const;
private:
AHCServerManager* m;
--- psi.spec.org 2006-02-10 19:51:48.000000000 +0100
+++ psi.spec 2006-02-11 01:14:26.000000000 +0100
@@ -1,7 +1,7 @@
# $Revision: 1.73.2.29.2.33 $, $Date: 2005/12/12 11:02:52 $
-%define snap 20051210
-%define _snap 2005-12-10
-%define _datasnap 2005-12-09
+%define snap 20060203
+%define _snap 2006-02-03
+%define _datasnap 2006-02-03
#
Summary: PSI - Jabber client
Summary(de): PSI - ein Instant Messaging Client-Programm für das Jabber
@@ -12,12 +12,12 @@
License: GPL
Group: Applications/Communications
Source0: http://www.radioemiter.pl/~pedrito/public/jabber/psi-pedrito/%{_snap}/%{name}-pedrito-%{_snap}.tar.bz2
-# Source0-md5: 4ca4b88e7e28cc8849ae4f01f9c6d66c
+# Source0-md5: 32f7f6caabebfbbc9be5feaeffbb25c1
Source1: http://www.radioemiter.pl/~pedrito/public/jabber/psi-pedrito/%{_datasnap}/%{name}-pedrito-%{_datasnap}-data.tar.bz2
-# Source1-md5: a466a4d57b02552ebd9533671e92ddcb
-Source2: http://michalj.alternatywa.info/psi/patches/emergency.png
-# Source2-md5: 5fa629c5177a7b1c5090428e22b7ec30
+# Source1-md5: 3ffd4746e5e27d9172044a184f7c1a09
Patch0: %{name}-desktop.patch
+Patch1: %{name}-pedrito-gcc4.patch
+Patch2: %{name}-pedrito-datadir.patch
URL: http://psi-pedrito.go.pl/
BuildRequires: libstdc++-devel
BuildRequires: cyrus-sasl-devel
@@ -74,6 +74,8 @@
%prep
%setup -q -n %{name}-pedrito-%{_snap}
#%patch0 -p1
+%patch1 -p0
+%patch2 -p0
%{__tar} jxf %{SOURCE1}
cd psi-pedrito-%{_datasnap}-data
@@ -113,7 +115,6 @@
install iconsets/roster/stellar-icq/online.png $RPM_BUILD_ROOT%{_pixmapsdir}/psi-stellar.png
install psi-pedrito-%{_datasnap}-data/*.qm $RPM_BUILD_ROOT%{_datadir}/psi
#install *.qm $RPM_BUILD_ROOT%{_datadir}/psi
-install %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/psi/iconsets/system/default/
install libpsi/psiwidgets/*.so $RPM_BUILD_ROOT%{_libdir}/qt/plugins-mt/designer
rm -rf $RPM_BUILD_ROOT%{_datadir}/psi/COPYING $RPM_BUILD_ROOT%{_datadir}/psi/README
@@ -124,7 +125,8 @@
%files
%defattr(644,root,root,755)
-%doc README TODO ChangeLog psi-pedrito.txt
+#%doc README TODO ChangeLog psi-pedrito.txt
+%doc README TODO ChangeLog
%attr(755,root,root) %{_bindir}/*
%dir %{_datadir}/psi
%{_datadir}/psi/certs
@@ -132,14 +134,14 @@
%{_datadir}/psi/sound
#%lang(ar) %{_datadir}/psi/psi_ar.qm
%lang(bg) %{_datadir}/psi/psi_bg.qm
-#%lang(ca) %{_datadir}/psi/psi_ca.qm
-%lang(cs) %{_datadir}/psi/psi_cs.qm
+%lang(ca) %{_datadir}/psi/psi_ca.qm
+#%lang(cs) %{_datadir}/psi/psi_cs.qm
#%lang(da) %{_datadir}/psi/psi_da.qm
-%lang(de) %{_datadir}/psi/psi_de.qm
-%lang(el) %{_datadir}/psi/psi_el.qm
+#%lang(de) %{_datadir}/psi/psi_de.qm
+#%lang(el) %{_datadir}/psi/psi_el.qm
%lang(eo) %{_datadir}/psi/psi_eo.qm
%lang(es) %{_datadir}/psi/psi_es.qm
-%lang(et) %{_datadir}/psi/psi_et.qm
+#%lang(et) %{_datadir}/psi/psi_et.qm
#%lang(fi) %{_datadir}/psi/psi_fi.qm
%lang(fr) %{_datadir}/psi/psi_fr.qm
%lang(hu) %{_datadir}/psi/psi_hu.qm
@@ -148,15 +150,15 @@
%lang(mk) %{_datadir}/psi/psi_mk.qm
%lang(nl) %{_datadir}/psi/psi_nl.qm
%lang(pl) %{_datadir}/psi/psi_pl.qm
-%lang(uk) %{_datadir}/psi/psi_uk.qm
+#%lang(uk) %{_datadir}/psi/psi_uk.qm
%lang(pt_BR) %{_datadir}/psi/psi_pt_BR.qm
-#%lang(pt) %{_datadir}/psi/psi_pt.qm
-%lang(ru) %{_datadir}/psi/psi_ru.qm
+%lang(pt) %{_datadir}/psi/psi_pt.qm
+#%lang(ru) %{_datadir}/psi/psi_ru.qm
#%lang(se) %{_datadir}/psi/psi_se.qm
%lang(sk) %{_datadir}/psi/psi_sk.qm
%lang(sl) %{_datadir}/psi/psi_sl.qm
-%lang(sr) %{_datadir}/psi/psi_sr.qm
-%lang(uk) %{_datadir}/psi/psi_uk.qm
+#%lang(sr) %{_datadir}/psi/psi_sr.qm
+#%lang(uk) %{_datadir}/psi/psi_uk.qm
%lang(vi) %{_datadir}/psi/psi_vi.qm
%lang(zh) %{_datadir}/psi/psi_zh.qm
%{_desktopdir}/*.desktop
_______________________________________________
pld-devel-pl mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
