Z okazji wydania wersji 0.1 ekg2 pomyślałem że upgradnę speca. Co z tego wyszło można zobaczyć w załączniku.
Nie nakłada się łatka ekg2-no_scripts.patch. Nie bardzo rozumiem czemu ona miała służyć i dlaczego skrypty pythona/perla były zakomentowane w specu. Jak to rozwiązać? Zastanawiam się też w jaki sposób wybierane są pluginy które są wydzielane do osobnych paczek. Dodałem plugin autoresponder do głównej paczki ekg2 i opis zmiennych do pluginu mail oraz xmsg. Wszelka krytyka mile widziana. ;) PS, może by zrobić bcond sqlite3 domyślnym? Adam
Index: ekg2.spec =================================================================== RCS file: /cvsroot/SPECS/ekg2.spec,v retrieving revision 1.78 diff -u -r1.78 ekg2.spec --- ekg2.spec 12 Feb 2007 21:23:54 -0000 1.78 +++ ekg2.spec 28 Jul 2007 17:58:58 -0000 @@ -20,7 +20,7 @@ %if %{with yesterday_snapshot} %define _snap %(date +%%Y%%m%%d -d yesterday) %else -%define _snap 20070113 +%define _snap 20070303 %endif %if !%{with jabber} @@ -34,15 +34,24 @@ Summary: Multi-protocol instant messaging and chat client Summary(pl.UTF-8): WieloprotokoÅowy komunikator internetowy Name: ekg2 -Version: 1.0 +%if %{with yesterday_snapshot} +Version: snapshot Release: 0.%{_snap}.1 +%else +Version: 0.1 +Release: 1 +%endif Epoch: 1 License: GPL v2+ Group: Applications/Communications +%if %{with yesterday_snapshot} Source0: http://pl.ekg2.org/%{name}-%{_snap}.tar.gz -# Source0-md5: 1922ef21e6e2568887ae8271f0c5f9c1 +%else +Source0: http://pl.ekg2.org/%{name}-%{version}.tar.gz +%endif +# Source0-md5: 9287d61dca9b27afee7127796d970bff Patch0: %{name}-perl-install.patch -Patch1: %{name}-no_scripts.patch +#Patch1: %{name}-no_scripts.patch URL: http://ekg2.org/ %{?with_aspell:BuildRequires: aspell-devel} BuildRequires: autoconf @@ -50,23 +59,23 @@ %{?with_jabber:BuildRequires: expat-devel} BuildRequires: gettext-devel %{?with_gadugadu:BuildRequires: giflib-devel} -%{?with_gadugadu:BuildRequires: libgadu-devel} -%{?with_gadugadu:BuildRequires: libjpeg-devel} %{?with_gnutls:BuildRequires: gnutls-devel >= 1.2.5} %{?with_gpg:BuildRequires: gpgme-devel} BuildRequires: gpm-devel %{?with_gtk:BuildRequires: gtk+2-devel} +%{?with_gadugadu:BuildRequires: libgadu-devel} %{?with_libgsm:BuildRequires: libgsm-devel} +%{?with_gadugadu:BuildRequires: libjpeg-devel} BuildRequires: libltdl-devel BuildRequires: libtool BuildRequires: ncurses-devel BuildRequires: openssl-devel >= 0.9.7d +%{?with_perl:BuildRequires: perl-devel} BuildRequires: pkgconfig %{?with_python:BuildRequires: python-devel} -%{?with_python:BuildRequires: rpm-pythonprov} -%{?with_perl:BuildRequires: perl-devel} -%{?with_perl:BuildRequires: rpm-perlprov} %{?with_readline:BuildRequires: readline-devel} +%{?with_perl:BuildRequires: rpm-perlprov} +%{?with_python:BuildRequires: rpm-pythonprov} BuildRequires: sed >= 4.0 %{?with_sqlite:BuildRequires: sqlite-devel} %{?with_sqlite3:BuildRequires: sqlite3-devel} @@ -78,7 +87,8 @@ Multi-protocol instant messaging and chat client with many plugins. %description -l pl.UTF-8 -WieloprotokoÅowy, otwarty komunikator internetowy z wieloma pluginami. +WieloprotokoÅowy, otwarty komunikator internetowy z wieloma +pluginami. %package devel Summary: ekg2 header files @@ -257,7 +267,7 @@ %prep %setup -q -n %{name}-%{_snap} %patch0 -p1 -%patch1 -p1 +#%patch1 -p1 sed -i -e 's/AC_LIBLTDL_CONVENIENCE/AC_LIBLTDL_INSTALLABLE/' configure.ac sed -i -e '\#/opt/sqlite/lib#s#"$# /usr/lib64"#' m4/sqlite.m4 @@ -312,15 +322,19 @@ %attr(755,root,root) %{_bindir}/ekg2 %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/plugins +%attr(755,root,root) %{_libdir}/%{name}/plugins/autoresponder.so +%{_datadir}/%{name}/plugins/autoresponder %attr(755,root,root) %{_libdir}/%{name}/plugins/httprc_xajax.so %attr(755,root,root) %{_libdir}/%{name}/plugins/logs.so %attr(755,root,root) %{_libdir}/%{name}/plugins/mail.so +%{_datadir}/%{name}/plugins/mail %attr(755,root,root) %{_libdir}/%{name}/plugins/ncurses.so %attr(755,root,root) %{_libdir}/%{name}/plugins/pcm.so %attr(755,root,root) %{_libdir}/%{name}/plugins/rc.so %attr(755,root,root) %{_libdir}/%{name}/plugins/rot13.so %attr(755,root,root) %{_libdir}/%{name}/plugins/sms.so %attr(755,root,root) %{_libdir}/%{name}/plugins/xmsg.so +%{_datadir}/%{name}/plugins/xmsg %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/plugins %{_datadir}/%{name}/*.txt @@ -405,14 +419,14 @@ %dir %{perl_vendorarch}/auto/Ekg2/Irc %{perl_vendorarch}/auto/Ekg2/Irc/Irc.bs %attr(755,root,root) %{perl_vendorarch}/auto/Ekg2/Irc/Irc.so -#%{_datadir}/%{name}/scripts/*.pl +%{_datadir}/%{name}/scripts/*.pl %endif %if %{with python} %files plugin-scripting-python %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/%{name}/plugins/python.so -#%{_datadir}/%{name}/scripts/*.py +%{_datadir}/%{name}/scripts/*.py %endif %files plugin-sim
_______________________________________________ pld-devel-pl mailing list pld-devel-pl@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl