SPECS: netGo.spec - FHS fix (arch-dependent binary moved to libdir)

qboosh qboosh at pld-linux.org
Mon Feb 20 19:39:27 CET 2006


Author: qboosh                       Date: Mon Feb 20 18:39:27 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- FHS fix (arch-dependent binary moved to libdir)

---- Files affected:
SPECS:
   netGo.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/netGo.spec
diff -u SPECS/netGo.spec:1.2 SPECS/netGo.spec:1.3
--- SPECS/netGo.spec:1.2	Mon Feb 20 19:32:03 2006
+++ SPECS/netGo.spec	Mon Feb 20 19:39:22 2006
@@ -12,6 +12,7 @@
 URL:		http://netgo.hjolug.org
 BuildRequires:	kdebase-devel
 BuildRequires:	qt-devel >= 3.2
+BuildRequires:	sed >= 4.0
 Requires:	net-tools
 Requires:	wireless-tools
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -36,6 +37,9 @@
 %prep
 %setup -q
 
+rm -f netgo-bin
+sed -i -e 's,/usr/share/netgo/netgo-bin,%{_libdir}/netgo/netgo-bin,' netgo
+
 %build
 export QTDIR=%{_prefix}
 %configure
@@ -44,10 +48,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name},%{_desktopdir},%{_iconsdir}/hicolor/32x32/apps}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name},%{_desktopdir},%{_iconsdir}/hicolor/32x32/apps}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install icons/satelite_32x32.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/32x32/apps/%{name}.png
-install netgo-bin $RPM_BUILD_ROOT%{_datadir}/%{name}
+install netgo-bin $RPM_BUILD_ROOT%{_libdir}/%{name}
 install netgo $RPM_BUILD_ROOT%{_bindir}
 
 %clean
@@ -55,9 +59,9 @@
 
 %files
 %defattr(644,root,root,755)
-%doc README TODO COPYING CHANGELOG
+%doc CHANGELOG README TODO
 %attr (755,root,root) %{_bindir}/*
-%attr (755,root,root) %{_datadir}/%{name}
+%attr (755,root,root) %{_libdir}/%{name}
 %{_iconsdir}/hicolor/32x32/apps/*
 %{_desktopdir}/%{name}.desktop
 
@@ -67,6 +71,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2006/02/20 18:39:22  qboosh
+- FHS fix (arch-dependent binary moved to libdir)
+
 Revision 1.2  2006/02/20 18:32:03  qboosh
 - typo, files fix
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/netGo.spec?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list