Author: glen Date: Tue Dec 13 12:50:39 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- adapterized
- pointless _prefix define removed
---- Files affected:
SPECS:
kdenetwork-kroupware.spec (1.9 -> 1.10)
---- Diffs:
================================================================
Index: SPECS/kdenetwork-kroupware.spec
diff -u SPECS/kdenetwork-kroupware.spec:1.9 SPECS/kdenetwork-kroupware.spec:1.10
--- SPECS/kdenetwork-kroupware.spec:1.9 Wed Dec 1 02:27:34 2004
+++ SPECS/kdenetwork-kroupware.spec Tue Dec 13 13:50:34 2005
@@ -29,7 +29,6 @@
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
Obsoletes: kdenetwork
-%define _prefix /usr
%define _fontdir /usr/share/fonts
%define _htmldir /usr/share/doc/kde/HTML
@@ -171,9 +170,9 @@
Summary(pl): Program pocztowy KDE
Summary(pt_BR): Cliente / leitor de e-mails para o KDE
Group: X11/Applications
+Requires: %{name} >= %{version}
Requires: kdebase-mailnews
Requires: kdelibs >= 3.1.1
-Requires: %{name} >= %{version}
Provides: kdenetwork-kmail
Obsoletes: kdenetwork-kmail
@@ -216,9 +215,9 @@
Summary(pl): Czytnik newsów dla KDE
Summary(pt_BR): Leitor de notícias (news) do KDE
Group: X11/Applications
+Requires: %{name} >= %{version}
Requires: kdebase-mailnews
Requires: kdelibs >= 3.1.1
-Requires: %{name} >= %{version}
Provides: kdenetwork-knode
Obsoletes: kdenetwork-knode
@@ -307,8 +306,8 @@
Summary: Virtual Desktops
Summary(pl): Wirtualne biurka
Group: X11/Applications
-Requires: kdelibs >= 3.1.1
Requires: %{name}-kinetd = %{version}
+Requires: kdelibs >= 3.1.1
Provides: kdenetwork-krfb
Obsoletes: kdenetwork-krfb
@@ -364,7 +363,7 @@
Summary: KDE LAN Browser
Summary(pl): Przeglądarka LAN-u dla KDE
Group: X11/Applications
-PreReq: rc-scripts
+Requires: rc-scripts
Requires(post,preun): /sbin/chkconfig
Requires: konqueror >= 3.1.1
Obsoletes: %{name}-lisa
@@ -400,13 +399,13 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{rc.d/init.d,sysconfig},/usr/bin} \
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{rc.d/init.d,sysconfig},%{_bindir}} \
$RPM_BUILD_ROOT%{_applnkdir}{/Settings/KDE,/Network/{Communications,M{ail,isc},News}}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT{%{_bindir}/{,res}lisa,/usr/bin}
+mv $RPM_BUILD_ROOT{%{_bindir}/{,res}lisa,%{_bindir}}
ALD=$RPM_BUILD_ROOT%{_applnkdir}
@@ -629,11 +628,11 @@
%files lanbrowser
%defattr(644,root,root,755)
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/lisarc
-%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/lisa
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lisarc
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/lisa
%attr(754,root,root) /etc/rc.d/init.d/lisa
-%attr(755,root,root) /usr/bin/lisa
-%attr(755,root,root) /usr/bin/reslisa
+%attr(755,root,root) %{_bindir}/lisa
+%attr(755,root,root) %{_bindir}/reslisa
%{_libdir}/kde3/kio_lan.la
%attr(755,root,root) %{_libdir}/kde3/kio_lan.so
%{_libdir}/kde3/kcm_lanbrowser.la
@@ -652,6 +651,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.10 2005/12/13 12:50:34 glen
+- adapterized
+- pointless _prefix define removed
+
Revision 1.9 2004/12/01 01:27:34 zbyniu
- added PreReq: rc-scripts and Requires(): /sbin/chkconfig for daemon
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kdenetwork-kroupware.spec?r1=1.9&r2=1.10&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
