Author: arvenil                      Date: Sun Nov  4 22:32:27 2007 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- [EMAIL PROTECTED] -> [EMAIL PROTECTED] (merged from HEAD)

---- Files affected:
SPECS:
   audacious.spec (1.24.4.12 -> 1.24.4.13) 

---- Diffs:

================================================================
Index: SPECS/audacious.spec
diff -u SPECS/audacious.spec:1.24.4.12 SPECS/audacious.spec:1.24.4.13
--- SPECS/audacious.spec:1.24.4.12      Sun Nov  4 23:22:46 2007
+++ SPECS/audacious.spec        Sun Nov  4 23:32:22 2007
@@ -39,6 +39,8 @@
 Requires:      audacious-output-plugin
 Obsoletes:     audacious-static
 Obsoletes:     audacious-visualization-rovascope
+# [EMAIL PROTECTED] vs. [EMAIL PROTECTED]
+Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -102,6 +104,8 @@
 # there is already .desktop in %{_desktopdir}
 rm -rf $RPM_BUILD_ROOT%{_datadir}/audacious/applications
 
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED] ] || \
+       mv -f $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED],latin}
 %find_lang %{name}
 
 %clean
@@ -164,6 +168,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24.4.13  2007/11/04 22:32:22  arvenil
+- [EMAIL PROTECTED] -> [EMAIL PROTECTED] (merged from HEAD)
+
 Revision 1.24.4.12  2007/11/04 22:22:46  arvenil
 - up to 1.4.0-rc1
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/audacious.spec?r1=1.24.4.12&r2=1.24.4.13&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to