rpms/tex-musixtex/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tex-musixtex.spec, 1.6, 1.7

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/tex-musixtex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13794

Modified Files:
	.cvsignore sources tex-musixtex.spec 
Log Message:
* Sat Jan 30 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.114-8
- Finally a tarball from upstream. Contains more recent stuff.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tex-musixtex/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Feb 2009 22:17:02 -0000	1.3
+++ .cvsignore	30 Jan 2010 23:23:37 -0000	1.4
@@ -1,2 +1 @@
-musixtex-t113.zip
-musixtex-patch-t114-rev4.zip
+musixtex114.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tex-musixtex/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Feb 2009 22:17:02 -0000	1.3
+++ sources	30 Jan 2010 23:23:37 -0000	1.4
@@ -1,2 +1 @@
-3840147db669cc3f26a0b5a3b3688c37  musixtex-t113.zip
-aee2a0913f82a86b9ae46a27e627d941  musixtex-patch-t114-rev4.zip
+4a650e7b4f8e48eb10d2d190a78a9a42  musixtex114.zip


Index: tex-musixtex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tex-musixtex/devel/tex-musixtex.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- tex-musixtex.spec	27 Jul 2009 05:51:12 -0000	1.6
+++ tex-musixtex.spec	30 Jan 2010 23:23:37 -0000	1.7
@@ -1,15 +1,15 @@
-%define texname musixtex
+%global texname musixtex
+%global minorver 114
 
 Name:      tex-%{texname}
 Summary:   Sophisticated music typesetting
 Group:     Applications/Publishing
-Version:   0.114
-Release:   7.rev4%{?dist}
+Version:   0.%{minorver}
+Release:   8%{?dist}
 URL:       http://www.mab.jpn.org/musictex/index_en.html
 License:   GPLv2+
-Source0:   http://tug.ctan.org/get/macros/musixtex/taupin/%{texname}-t113.zip
-# There is no upstream source for version t114. They just provide a "patch":
-Source1:   http://tug.ctan.org/get/macros/musixtex/taupin/%{texname}-patch-t114-rev4.zip
+Source0:   http://icking-music-archive.org/software/musixtex/%{texname}%{minorver}.zip
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 # For rpm's TeX macros:
@@ -35,10 +35,12 @@ up from MusicTeX and has advantages both
 output. The package contains the TeX documentation for MusixTeX.
 
 %prep
-%setup -q -c %{texname} -a 1
-# Apply the t114 "patch":
-mv -f musixdoc* doc/%{texname}/
-mv -f musix*.tex tex/
+%setup -q -c %{texname}%{minorver}
+
+# Fix EOL encoding
+sed 's|\r||' changelog.txt > changelog.txt.fixed
+touch -r changelog.txt changelog.txt.fixed
+mv -f changelog.txt.fixed changelog.txt
 
 # We don't need these files:
 find . -name "*.bat" -exec rm {} \;
@@ -55,16 +57,17 @@ echo "Nothing to build."
 rm -rf %{buildroot}
 
 # Define for convenience:
-%define MUSIXTEXDIR     %{_texmf_main}/tex/generic/%{texname}
-%define MUSIXDOCDIR     %{_texmf_main}/doc/generic/%{texname}
-%define MUSIXMFDIR      %{_texmf_main}/fonts/source/public/%{texname}
-%define MUSIXTFMDIR     %{_texmf_main}/fonts/tfm/public/%{texname}
-%define TEXMFTYPE1DIR   %{_texmf_main}/fonts/type1/public
-%define MUSIXDVIPDFMDIR %{_texmf_main}/fonts/map/dvipdfm/%{texname}
-%define MUSIXDVIPSDIR   %{_texmf_main}/fonts/map/dvips/%{texname}
+%global MUSIXTEXDIR     %{_texmf_main}/tex/generic/%{texname}
+%global MUSIXDOCDIR     %{_texmf_main}/doc/generic/%{texname}
+%global MUSIXMFDIR      %{_texmf_main}/fonts/source/public/%{texname}
+%global MUSIXTFMDIR     %{_texmf_main}/fonts/tfm/public/%{texname}
+%global TEXMFTYPE1DIR   %{_texmf_main}/fonts/type1/public
+%global MUSIXDVIPDFMDIR %{_texmf_main}/fonts/map/dvipdfm/%{texname}
+%global MUSIXDVIPSDIR   %{_texmf_main}/fonts/map/dvips/%{texname}
 
 mkdir -p %{buildroot}/{%MUSIXTEXDIR,%MUSIXDOCDIR,%MUSIXMFDIR,%MUSIXTFMDIR,%TEXMFTYPE1DIR,%MUSIXDVIPDFMDIR,%MUSIXDVIPSDIR}
 
+pushd MusiXTeXDistribution
 # The TeX files:
 install -pm 644 tex/*.tex %{buildroot}/%MUSIXTEXDIR
 install -pm 644 tex/*.sty %{buildroot}/%MUSIXTEXDIR
@@ -81,7 +84,9 @@ install -pm 644 dvipdfm/* %{buildroot}/%
 install -pm 644 dvips/* %{buildroot}/%MUSIXDVIPSDIR
 
 # TeX documentation:
-cp -a doc/* %{buildroot}/%MUSIXDOCDIR
+cp -a doc/* ../TestTeXInputs/* %{buildroot}/%MUSIXDOCDIR
+
+popd #MusiXTeXDistribution
 
 %clean
 rm -rf %{buildroot}
@@ -106,7 +111,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc copying readme*.txt
+%doc MusiXTeXDistribution/copying changelog.txt 
 %MUSIXTEXDIR
 %MUSIXDVIPDFMDIR
 %MUSIXDVIPSDIR
@@ -120,6 +125,9 @@ fi
 %MUSIXDOCDIR
 
 %changelog
+* Sat Jan 30 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.114-8
+- Finally a tarball from upstream. Contains more recent stuff.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.114-7.rev4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild