rpms/texlive-texmf/devel texlive-filter-requires.sh, 1.2, 1.3 texlive-texmf.spec, 1.34, 1.35

[Jindrich Novy]

Author: jnovy

Update of /cvs/pkgs/rpms/texlive-texmf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31910

Modified Files:
	texlive-filter-requires.sh texlive-texmf.spec 
Log Message:
* Tue Oct 20 2009 Jindrich Novy <jnovy at redhat.com> 2007-31
- do not conflict with dvipdfm
- update perl requires filter



Index: texlive-filter-requires.sh
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/devel/texlive-filter-requires.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- texlive-filter-requires.sh	29 Aug 2008 05:09:04 -0000	1.2
+++ texlive-filter-requires.sh	21 Oct 2009 12:43:26 -0000	1.3
@@ -1,2 +1,2 @@
 #!/bin/sh
-/usr/lib/rpm/perl.req "$@" | grep -v 'perl(\(Tk\|Win32\|only\|path_tre\|just\|Htex\|Pts\|a\)'
+/usr/lib/rpm/perl.req "$@" | grep -v 'perl(\(Tk\|Win32\|only\|path_tre\|just\|Htex\|Pts\|a\|Reg_macro\)'


Index: texlive-texmf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/devel/texlive-texmf.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- texlive-texmf.spec	16 Oct 2009 05:34:30 -0000	1.34
+++ texlive-texmf.spec	21 Oct 2009 12:43:26 -0000	1.35
@@ -14,7 +14,7 @@
 
 Name:		texlive-texmf
 Version:	2007
-Release:	30%{?dist}
+Release:	31%{?dist}
 Summary:	Architecture independent parts of the TeX formatting system
 
 Group:		Applications/Publishing
@@ -427,6 +427,9 @@ rm -rf %{buildroot}%{_texmf_main}/doc/la
 # remove $TEXMFMAIN/tex/texinfo to not to clash with texinfo (#226488)
 rm -rf %{buildroot}%{_texmf_main}/tex/texinfo/
 
+# remove dvipdfm configuration file
+rm -rf %{buildroot}%{_texmf_main}/dvipdfm
+
 # create macro file for building texlive
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 cat <<EOF > %{buildroot}%{_sysconfdir}/rpm/macros.texlive
@@ -589,9 +592,9 @@ fi
 %{_texmf_main}/bibtex/bst/[a-b]*/
 %{_texmf_main}/bibtex/bst/camel/
 %{_texmf_main}/bibtex/bst/[d-x]*/
-%dir %{_texmf_main}/dvipdfm
-%dir %{_texmf_main}/dvipdfm/config
-%{_texmf_main}/dvipdfm/config/config
+#%dir %{_texmf_main}/dvipdfm
+#%dir %{_texmf_main}/dvipdfm/config
+#%{_texmf_main}/dvipdfm/config/config
 %dir %{_texmf_main}/fmtutil
 %{_texmf_main}/makeindex/
 %{_texmf_main}/metafont/
@@ -828,6 +831,10 @@ fi
 %doc %{_texmf_main}/doc/
 
 %changelog
+* Tue Oct 20 2009 Jindrich Novy <jnovy at redhat.com> 2007-31
+- do not conflict with dvipdfm
+- update perl requires filter
+
 * Thu Oct 15 2009 Jindrich Novy <jnovy at redhat.com> 2007-30
 - update latin.ldf (#469948)
 - do not provide any perl dependencies (#516350)