rpms/terminus-font/devel terminus-font.spec,1.4,1.5

[Hans Ulrich Niedermann (ndim)]

Author: ndim

Update of /cvs/pkgs/rpms/terminus-font/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19158

Modified Files:
	terminus-font.spec 
Log Message:
Use %{buildroot} macro



Index: terminus-font.spec
===================================================================
RCS file: /cvs/pkgs/rpms/terminus-font/devel/terminus-font.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- terminus-font.spec	15 Aug 2007 11:49:29 -0000	1.4
+++ terminus-font.spec	19 Jan 2008 15:42:29 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           terminus-font
 Version:        4.20
-Release:        8%{?dist}
+Release:        8.1%{?dist}
 Summary:        Clean fixed width font
 BuildArch:      noarch
 
@@ -119,24 +119,24 @@
 
 # Fedora specific docs and examples
 mkdir -p docs/console docs/x11
-cp "%{SOURCE10}" docs/console/README.fedora
-cp "%{SOURCE20}" docs/x11/README.fedora
-cp "%{SOURCE21}" docs/x11/Xresources.example
+%{__cp} -p "%{SOURCE10}" docs/console/README.fedora
+%{__cp} -p "%{SOURCE20}" docs/x11/README.fedora
+%{__cp} -p "%{SOURCE21}" docs/x11/Xresources.example
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%{__rm} -rf "%{buildroot}"
+%{__make} install DESTDIR="%{buildroot}"
 # Create %%ghost files (to simulate files created by mkfontdir)
-(cd "$RPM_BUILD_ROOT%{local_x11_font_dir}" && \
+(cd "%{buildroot}%{local_x11_font_dir}" && \
     touch fonts.dir fonts.scale fonts.alias encodings.dir)
-# Install catalogue symlink                             
-mkdir -p "$RPM_BUILD_ROOT%{catalogue}"
-ln -sf "%{local_x11_font_dir}" "$RPM_BUILD_ROOT%{catalogue}/%{name}:unscaled"
+# Install catalogue symlink
+%{__mkdir_p} "%{buildroot}%{catalogue}"
+%{__ln_s} -f "%{local_x11_font_dir}" "%{buildroot}%{catalogue}/%{name}:unscaled"
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf "%{buildroot}"
 
 
 %files x11