rpms/wine/FC-5 .cvsignore, 1.11, 1.12 sources, 1.12, 1.13 wine.spec, 1.20, 1.21 wine-20050524-generated.patch, 1.1, NONE

Andreas Bierfert (awjb) fedora-extras-commits at redhat.com
Fri Mar 17 13:24:54 UTC 2006


Author: awjb

Update of /cvs/extras/rpms/wine/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11074/FC-5

Modified Files:
	.cvsignore sources wine.spec 
Removed Files:
	wine-20050524-generated.patch 
Log Message:
- version upgrade
- drop ancient fonts



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	15 Mar 2006 21:59:45 -0000	1.11
+++ .cvsignore	17 Mar 2006 13:24:54 -0000	1.12
@@ -1,2 +1 @@
-wine-fonts-20050524.tar.gz
 wine-0.9.10-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	15 Mar 2006 21:59:45 -0000	1.12
+++ sources	17 Mar 2006 13:24:54 -0000	1.13
@@ -1,2 +1 @@
-fb216b10993cb17501efff7afa812da1  wine-fonts-20050524.tar.gz
 054e71983834d777be3271f63f8484d6  wine-0.9.10-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/wine.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wine.spec	15 Mar 2006 21:59:45 -0000	1.20
+++ wine.spec	17 Mar 2006 13:24:54 -0000	1.21
@@ -11,7 +11,6 @@
 # special fedora tarball without winemp3 stuff
 Source0:        wine-0.9.10-fe.tar.bz2
 Source1:	wine.init
-Source2:	wine-fonts-20050524.tar.gz
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
 Source100:      wine-notepad.desktop
@@ -21,7 +20,6 @@
 Source104:      wine-winefile.desktop
 Source105:      wine-winemine.desktop
 Source106:      wine-winhelp.desktop
-Patch2:		wine-20050524-generated.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -158,8 +156,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}-fe
-%patch2 -p1 -b .generated
-autoconf
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -193,10 +189,6 @@
 mkdir -p %{buildroot}%{_initrddir}
 install -p -c -m 755 %SOURCE1 %{buildroot}%{_initrddir}/wine
 
-# Install Wine's fonts
-mkdir -p %{buildroot}%{_datadir}/fonts/wine
-tar xzf %SOURCE2 -C %{buildroot}%{_datadir}/fonts/wine
-
 desktop-file-install \
   --vendor=fedora \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
@@ -550,48 +542,7 @@
 %{_libdir}/wine/wtsapi32.dll.so
 %{_libdir}/wine/security.dll.so
 %{_libdir}/wine/sfc.dll.so
-%dir %{_datadir}/fonts/wine
-%{_datadir}/fonts/wine/wine_coure.fon
-%{_datadir}/fonts/wine/wine_couree.fon
-%{_datadir}/fonts/wine/wine_courer.fon
-%{_datadir}/fonts/wine/wine_marlett.ttf
-%{_datadir}/fonts/wine/wine_sserife.fon
-%{_datadir}/fonts/wine/wine_sserifee.fon
-%{_datadir}/fonts/wine/wine_sserifer.fon
-%{_datadir}/fonts/wine/wine_vgasys.fon
-%{_datadir}/fonts/wine/wine_vgasyse.fon
-%{_datadir}/fonts/wine/wine_vgasysr.fon
-%{_datadir}/fonts/wine/coue1255.fon
-%{_datadir}/fonts/wine/coue1256.fon
-%{_datadir}/fonts/wine/coue1257.fon
-%{_datadir}/fonts/wine/coure.fon
-%{_datadir}/fonts/wine/couree.fon
-%{_datadir}/fonts/wine/coureg.fon
-%{_datadir}/fonts/wine/courer.fon
-%{_datadir}/fonts/wine/couret.fon
-%{_datadir}/fonts/wine/cvgasys.fon
-%{_datadir}/fonts/wine/hvgasys.fon
-%{_datadir}/fonts/wine/jvgasys.fon
-%{_datadir}/fonts/wine/marlett.ttf
-%{_datadir}/fonts/wine/ssee1255.fon
-%{_datadir}/fonts/wine/ssee1256.fon
-%{_datadir}/fonts/wine/ssee1257.fon
-%{_datadir}/fonts/wine/ssee874.fon
-%{_datadir}/fonts/wine/sserife.fon
-%{_datadir}/fonts/wine/sserifee.fon
-%{_datadir}/fonts/wine/sserifeg.fon
-%{_datadir}/fonts/wine/sserifer.fon
-%{_datadir}/fonts/wine/sserifet.fon
-%{_datadir}/fonts/wine/svgasys.fon
-%{_datadir}/fonts/wine/vgas1255.fon
-%{_datadir}/fonts/wine/vgas1256.fon
-%{_datadir}/fonts/wine/vgas1257.fon
-%{_datadir}/fonts/wine/vgas874.fon
-%{_datadir}/fonts/wine/vgasys.fon
-%{_datadir}/fonts/wine/vgasyse.fon
-%{_datadir}/fonts/wine/vgasysg.fon
-%{_datadir}/fonts/wine/vgasysr.fon
-%{_datadir}/fonts/wine/vgasyst.fon
+%{_datadir}/wine/fonts/
 %{_libdir}/wine/winealsa.drv.so
 %{_libdir}/wine/wineps.drv.so
 %{_libdir}/wine/wineps16.drv16
@@ -696,6 +647,11 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Thu Mar 16 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.10-1
+- version upgrade
+- drop ancient extra fonts
+
 * Fri Mar 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.9-1
 - version upgrade


--- wine-20050524-generated.patch DELETED ---




More information about the fedora-extras-commits mailing list