W załączniku łatka poprawiająca budowanie się ekg2.spec z bcondem
yesterday_snapshot. Przestało się budować z powodu usunięcia z
ostatnich wersji ekg2 include i ekg2-config.
Dodałem też budowanie trzech nowych pluginów (feed, jogger, polchat)
przy włączonym yesterday_snapshot oraz włączyłem domyślnie używanie
sqlite3 w miejsce sqlite.
Adam
Index: ekg2.spec
===================================================================
RCS file: /cvsroot/SPECS/ekg2.spec,v
retrieving revision 1.85
diff -u -r1.85 ekg2.spec
--- ekg2.spec 6 May 2008 19:44:54 -0000 1.85
+++ ekg2.spec 16 Jul 2008 21:07:48 -0000
@@ -4,6 +4,7 @@
%bcond_with yesterday_snapshot # Build most current ekg2 snapshot
# (must use ./builder -n5 or plain rpmbuild)
%bcond_without aspell # build without spell-checking support with aspell
+%bcond_without feed # don't build feed plugin
%bcond_without gadugadu # don't build gg plugin
%bcond_without gpg # don't build gpg plugin
%bcond_without gtk # don't build gtk plugin
@@ -13,8 +14,8 @@
%bcond_without perl # don't build Perl plugin
%bcond_without python # don't build Python plugin
%bcond_without readline # don't build readline interface
-%bcond_without sqlite # don't build logsqlite plugin based on sqlite (conflicts with sqlite3)
-%bcond_with sqlite3 # build logsqlite plugin based on sqlite3
+%bcond_with sqlite # build logsqlite plugin based on sqlite (conflicts with sqlite3)
+%bcond_without sqlite3 # don't build logsqlite plugin based on sqlite3
%bcond_without xosd # don't build xosd plugin
%if %{with yesterday_snapshot}
@@ -29,8 +30,8 @@
%undefine with_gnutls
%endif
-%if %{with sqlite3}
-%undefine sqlite
+%if %{with sqlite}
+%undefine sqlite3
%endif
Summary: Multi-protocol instant messaging and chat client
@@ -49,7 +50,9 @@
%{?with_aspell:BuildRequires: aspell-devel}
BuildRequires: autoconf
BuildRequires: automake
-%{?with_jabber:BuildRequires: expat-devel}
+%if %{with feed} || %{with jabber}
+BuildRequires: expat-devel
+%endif
BuildRequires: gettext-devel
%{?with_gadugadu:BuildRequires: giflib-devel}
%{?with_gnutls:BuildRequires: gnutls-devel >= 1.2.5}
@@ -82,6 +85,7 @@
%description -l pl.UTF-8
WieloprotokoÅowy, otwarty komunikator internetowy z wieloma wtyczkami.
+%if %{without yesterday_snapshot}
%package devel
Summary: ekg2 header files
Summary(pl.UTF-8): Pliki nagÅówkowe ekg2
@@ -93,6 +97,21 @@
%description devel -l pl.UTF-8
Pliki nagÅówkowe ekg2.
+%endif
+
+%if %{with yesterday_snapshot}
+%package plugin-feed
+Summary: feed plugin for ekg2
+Summary(pl.UTF-8): Wtyczka feed dla ekg2
+Group: Applications/Communications
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description plugin-feed
+feed plugin for ekg2.
+
+%description plugin-feed -l pl.UTF-8
+Wtyczka feed dla ekg2.
+%endif
%package plugin-gpg
Summary: gpg plugin for ekg2
@@ -131,6 +150,20 @@
%description plugin-ioctld -l pl.UTF-8
Wtyczka ioctld dla ekg2 (zawiera program z ustawionym suid root!).
+%if %{with yesterday_snapshot}
+%package plugin-jogger
+Summary: Jogger plugin for ekg2
+Summary(pl.UTF-8): Wtyczka jogger dla ekg2
+Group: Applications/Communications
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description plugin-jogger
+Jogger plugin for ekg2.
+
+%description plugin-jogger -l pl.UTF-8
+Wtyczka jogger dla ekg2.
+%endif
+
%package plugin-logsqlite
Summary: SQLite log plugin for ekg2
Summary(pl.UTF-8): Wtyczka logowania do SQLite dla ekg2
@@ -196,6 +229,20 @@
%description plugin-protocol-jabber -l pl.UTF-8
Wtyczka protokoÅu Jabber dla ekg2.
+%if %{with yesterday_snapshot}
+%package plugin-protocol-polchat
+Summary: Polchat protocol plugin for ekg2
+Summary(pl.UTF-8): Wtyczka protokoÅu polchat dla ekg2
+Group: Applications/Communications
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description plugin-protocol-polchat
+Polchat protocol plugin for ekg2.
+
+%description plugin-protocol-polchat -l pl.UTF-8
+Wtyczka protokoÅu polchat dla ekg2.
+%endif
+
%package plugin-readline
Summary: readline interface
Summary(pl.UTF-8): Interfejs readline
@@ -284,7 +331,11 @@
%{!?with_gpg:--without-gpg} \
--with%{!?with_gtk:out}-gtk \
--with%{!?with_gnutls:out}-libgnutls \
- --with%{!?with_jabber:out}-expat \
+%if %{with feed} || %{with jabber}
+ --with-expat \
+%else
+ --without-expat \
+%endif
--with%{!?with_libgsm:out}-libgsm \
%{!?with_perl:--without-perl} \
--with%{!?with_python:out}-python \
@@ -341,10 +392,18 @@
%dir %{_datadir}/%{name}/scripts
%{_datadir}/%{name}/themes
+%if %{without yesterday_snapshot}
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/ekg2-config
%{_includedir}/ekg2
+%endif
+
+%if %{with yesterday_snapshot}
+%files plugin-feed
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/plugins/feed.so
+%endif
%if %{with gpg}
%files plugin-gpg
@@ -364,6 +423,12 @@
%{_datadir}/%{name}/plugins/ioctld
%attr(4755,root,root) %{_libexecdir}/ioctld
+%if %{with yesterday_snapshot}
+%files plugin-jogger
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/plugins/jogger.so
+%endif
+
%if %{with sqlite} || %{with sqlite3}
%files plugin-logsqlite
%defattr(644,root,root,755)
@@ -392,6 +457,12 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/plugins/jabber.so
%{_datadir}/%{name}/plugins/jabber
+%endif
+
+%if %{with yesterday_snapshot}
+%files plugin-protocol-polchat
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/plugins/polchat.so
%endif
%if %{with readline}
_______________________________________________
pld-devel-pl mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
