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

[Andrea Musuruane]

Author: musuruan

Update of /cvs/free/rpms/devede/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8547

Modified Files:
	devede.spec 
Log Message:
* Wed Jan 14 2009 Andrea Musuruane <musuruan at gmail.com> 3.11b-4
- Used DejaVuSans.ttf instead of devedesans.ttf
- Changed libdir to %{_datadir} like other python packages
- Improved macro usage



Index: devede.spec
===================================================================
RCS file: /cvs/free/rpms/devede/devel/devede.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- devede.spec	20 Dec 2008 18:28:41 -0000	1.6
+++ devede.spec	17 Jan 2009 14:10:00 -0000	1.7
@@ -1,8 +1,6 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
 Name: devede
 Version: 3.11b
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: DeVeDe is a program to create video DVDs and CDs (VCD, sVCD or CVD)
 
 Group: Applications/Multimedia
@@ -25,6 +23,7 @@
 Requires: python >= 2.4
 Requires: pygtk2
 Requires: pygtk2-libglade
+Requires: dejavu-fonts
 
 %description
 DeVeDe is a program to create video DVDs and CDs (VCD, sVCD or CVD), 
@@ -39,7 +38,7 @@
 %setup -q -n %{name}-3.11
 
 # Fix devede module directory
-sed -i 's!/usr/lib/!%{python_sitelib}/!' devede.py
+sed -i 's!/usr/lib/!%{_datadir}/!' devede.py
 
 
 %build
@@ -53,12 +52,16 @@
   --targeted=yes \
   --DESTDIR=$RPM_BUILD_ROOT \
   --prefix=%{_prefix} \
-  --libdir=%{python_sitelib} \
+  --libdir=%{_datadir} \
   --pkgdocdir=%{_docdir}/%{name}-%{version}
 
 # remove debian files from doc
 rm $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/{copyright,changelog.Debian}
 
+# replace devedesans.ttf with a symlink to DejaVuSans.ttf
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/devedesans.ttf
+ln -s %{_datadir}/fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT%{_datadir}/%{name}/devedesans.ttf
+
 # rename .desktop file 
 desktop-file-install \
   --delete-original \
@@ -89,15 +92,19 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%{_bindir}/devede
-%{python_sitelib}/devede
-%{_datadir}/devede
+%{_bindir}/%{name}
+%{_datadir}/%{name}
 %{_datadir}/applications/livna-%{name}.desktop
 %{_datadir}/pixmaps/%{name}.svg
 %doc %{_docdir}/%{name}-%{version}
 
 
 %changelog
+* Wed Jan 14 2009 Andrea Musuruane <musuruan at gmail.com> 3.11b-4
+- Used DejaVuSans.ttf instead of devedesans.ttf
+- Changed libdir to %%{_datadir} like other python packages
+- Improved macro usage
+
 * Sat Dec 20 2008 Andrea Musuruane <musuruan at gmail.com> 3.11b-3
 - Rebuilt for python 2.6