Author: darekr Date: Sun Sep 11 14:12:40 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use _desktopdir - added two defines for proper build, works - rel. 6
---- Files affected: SPECS: xsysinfo.spec (1.21 -> 1.22) ---- Diffs: ================================================================ Index: SPECS/xsysinfo.spec diff -u SPECS/xsysinfo.spec:1.21 SPECS/xsysinfo.spec:1.22 --- SPECS/xsysinfo.spec:1.21 Mon Jun 23 16:39:37 2003 +++ SPECS/xsysinfo.spec Sun Sep 11 16:12:34 2005 @@ -10,7 +10,7 @@ Summary(uk): đŇĎÇŇÁÍÁ ÍĎÎŚÔĎŇÉÎÇŐ ÓÉÓÔĹÍÎĎÇĎ ÚÁ×ÁÎÔÁÖĹÎÎŃ Name: xsysinfo Version: 1.7 -Release: 5 +Release: 6 License: MIT Group: X11/Applications #Source0: ftp://sunsite.unc.edu/pub/Linux/system/status/xstatus/%{name}-%{version}.tar.gz @@ -19,9 +19,12 @@ Source1: %{name}.desktop Source2: %{name}.png Patch0: %{name}-leak.patch -Icon: xsysinfo.xpm +Icon: %{name}.xpm BuildRequires: XFree86-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%define _appdefsdir /usr/X11R6/lib/X11/app-defaults +%define _xbindir /usr/X11R6/bin %description Xsysinfo is a graphic kernel monitoring tool for the X Window System. @@ -87,11 +90,12 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_applnkdir}/System,%{_pixmapsdir}} +install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}} -%{__make} install DESTDIR=$RPM_BUILD_ROOT +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT -install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/System +install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir} @@ -101,10 +105,10 @@ %files %defattr(644,root,root,755) %doc README CHANGES -%attr(755,root,root) %{_bindir}/xsysinfo -%config %{_libdir}/X11/app-defaults/XSysinfo -%config %{_libdir}/X11/app-defaults/XSysinfo-color -%{_applnkdir}/System/xsysinfo.desktop +%attr(755,root,root) %{_xbindir}/xsysinfo +%config %{_appdefsdir}/XSysinfo +%config %{_appdefsdir}/XSysinfo-color +%{_desktopdir}/xsysinfo.desktop %{_pixmapsdir}/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -113,6 +117,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.22 2005/09/11 14:12:34 darekr +- use _desktopdir +- added two defines for proper build, works +- rel. 6 + Revision 1.21 2003/06/23 14:39:37 ankry - md5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xsysinfo.spec?r1=1.21&r2=1.22&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
