rpms/e16/devel e16.spec,1.6,1.7

[Terje Røsten]

Author: terjeros

Update of /cvs/extras/rpms/e16/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2622

Modified Files:
	e16.spec 
Log Message:
* Sun Dec 28 2008 Terje Rosten <terjeros at phys.ntnu.no> - 0.16.8.14-4
- Various hacks (fonts dir, %pretrans) to make update smooth



Index: e16.spec
===================================================================
RCS file: /cvs/extras/rpms/e16/devel/e16.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- e16.spec	27 Dec 2008 10:27:19 -0000	1.6
+++ e16.spec	28 Dec 2008 20:38:32 -0000	1.7
@@ -3,7 +3,7 @@
 Summary:       The Enlightenment window manager, DR16
 Name:          e16
 Version:       0.16.8.14
-Release:       3%{?dist}
+Release:       4%{?dist}
 License:       MIT with advertising and GPLv2+
 Group:         User Interface/Desktops
 URL:           http://www.enlightenment.org/
@@ -43,26 +43,29 @@
     rm -f $f.iso88591
 done
 
-
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 %{__rm} -f %{buildroot}%{_libdir}/%{name}/libhack*.{a,la} 
 %{__chmod} 0644 %{buildroot}%{_datadir}/%{name}/themes/winter/ABOUT/MAIN
 
+%{__rm} -rf %{buildroot}%{_datadir}/%{name}/themes/winter/ttfonts
+%{__ln_s} ../../fonts %{buildroot}%{_datadir}/%{name}/themes/winter/ttfonts
+
 # Vera -> Dejavu
-%{__rm} -f %{buildroot}%{_datadir}/%{name}/themes/winter/ttfonts/Vera.ttf
-%{__ln_s}  ../../../fonts/dejavu/DejaVuSans.ttf \
-    %{buildroot}%{_datadir}/%{name}/themes/winter/ttfonts/Vera.ttf
-%{__rm} -f %{buildroot}%{_datadir}/%{name}/themes/winter/ttfonts/VeraBd.ttf
-%{__ln_s}  ../../../fonts/dejavu/DejaVuSans-Bold.ttf \
-    %{buildroot}%{_datadir}/%{name}/themes/winter/ttfonts/VeraBd.ttf
+%{__install} -d %{buildroot}%{_datadir}/%{name}/fonts
+%{__ln_s}  ../../fonts/dejavu/DejaVuSans.ttf %{buildroot}%{_datadir}/%{name}/fonts/Vera.ttf
+%{__ln_s}  ../../fonts/dejavu/DejaVuSans-Bold.ttf %{buildroot}%{_datadir}/%{name}/fonts/VeraBd.ttf
 
 %find_lang %{name}
 
 %clean
 %{__rm} -rf %{buildroot}
 
+%pretrans
+[ -L %{_datadir}/%{name}/themes/winter/ttfonts ] && \
+    %{__rm} -f %{_datadir}/%{name}/themes/winter/ttfonts
+
 %files -f %{name}.lang
 %defattr(-, root, root, -) 
 %doc AUTHORS COPYING ChangeLog README docs/README-0.16.8
@@ -74,6 +77,9 @@
 %{_datadir}/xsessions/*
 
 %changelog
+* Sun Dec 28 2008 Terje Rosten <terjeros at phys.ntnu.no> - 0.16.8.14-4
+- Various hacks (fonts dir, %%pretrans) to make update smooth
+
 * Sat Dec 27 2008 Terje Rosten <terjeros at phys.ntnu.no> - 0.16.8.14-3
 - Use Dejavu fonts