rpms/texlive/devel texlive.spec,1.3,1.4

[Jindrich Novy (jnovy)]

Author: jnovy

Update of /cvs/extras/rpms/texlive/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6839

Modified Files:
	texlive.spec 
Log Message:
- avoid conflicts with tetex-doc package



Index: texlive.spec
===================================================================
RCS file: /cvs/extras/rpms/texlive/devel/texlive.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- texlive.spec	2 Dec 2007 16:16:37 -0000	1.3
+++ texlive.spec	4 Dec 2007 11:18:57 -0000	1.4
@@ -23,7 +23,7 @@
 
 Name:		texlive
 Version:	%{texlive_ver}
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Binaries for the TeX formatting system
 
 Group:		Applications/Publishing
@@ -706,16 +706,16 @@
 # remove %{buildroot}%{_bindir}/platex
 rm -f %{buildroot}%{_bindir}/platex
 # Convert documents to UTF-8
-mkdir -p %{buildroot}%{_texmf_main}/doc/ptex/ptex-src \
+mkdir -p %{buildroot}%{_texmf_main}/doc/ptex/ptex-src-%{name} \
          %{buildroot}%{_texmf_main}/doc/pdvipsk \
          %{buildroot}%{_texmf_main}/doc/pxdvik/READMEs
 cd texk/web2c/ptex-src-%{ptex_src_ver}
 iconv -f ISO-2022-JP -t UTF-8 \
       COPYRIGHT.jis \
-      -o %{buildroot}%{_texmf_main}/doc/ptex/ptex-src/COPYRIGHT-ja
+      -o %{buildroot}%{_texmf_main}/doc/ptex/ptex-src-%{name}/COPYRIGHT-ja
 for i in README.txt Changes.txt ; do
   iconv -f EUC-JP -t UTF-8 ${i} \
-        -o %{buildroot}%{_texmf_main}/doc/ptex/ptex-src/${i}
+        -o %{buildroot}%{_texmf_main}/doc/ptex/ptex-src-%{name}/${i}
 done
 cd -
 cd pdvipsk
@@ -746,10 +746,10 @@
 
 mkdir -p %{buildroot}%{_mandir}/ja/man1
 iconv -f EUC-JP -t UTF-8 mendex.1 -o %{buildroot}%{_mandir}/ja/man1/mendex.1
-mkdir -p %{buildroot}%{_datadir}/texmf/doc/mendexk
-install -p -m 644 COPYRIGHT ChangeLog %{buildroot}%{_datadir}/texmf/doc/mendexk
-iconv -f EUC-JP -t UTF-8 README -o %{buildroot}%{_datadir}/texmf/doc/mendexk/README
-iconv -f ISO-2022-JP -t UTF-8 COPYRIGHT.jis -o %{buildroot}%{_datadir}/texmf/doc/mendexk/COPYRIGHT.jis
+mkdir -p %{buildroot}%{_datadir}/texmf/doc/mendexk-%{name}
+install -p -m 644 COPYRIGHT ChangeLog %{buildroot}%{_datadir}/texmf/doc/mendexk-%{name}
+iconv -f EUC-JP -t UTF-8 README -o %{buildroot}%{_datadir}/texmf/doc/mendexk-%{name}/README
+iconv -f ISO-2022-JP -t UTF-8 COPYRIGHT.jis -o %{buildroot}%{_datadir}/texmf/doc/mendexk-%{name}/COPYRIGHT.jis
 cd -
 %endif
 
@@ -1318,7 +1318,7 @@
 %if %{enable_japanese}
 %{_bindir}/mendex
 %{_mandir}/ja/man1/mendex.1*
-%doc %{_texmf_main}/doc/mendexk/
+%doc %{_texmf_main}/doc/mendexk-%{name}/
 %endif
 
 %files -n dvipdfm
@@ -1339,6 +1339,9 @@
 %{_texmf_main}/dvipdfm/
 
 %changelog
+* Tue Dec 04 2007 Jindrich Novy <jnovy at redhat.com> - 2007-2
+- avoid conflicts with tetex-doc package
+
 * Sun Dec 02 2007 Jindrich Novy <jnovy at redhat.com> - 2007-1
 - buildrequire texlive-texmf-fonts and texlive-texmf-latex for ptex
 - drop BR gawk