OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-fonts?expand=0&rev=3

xorg-x11-fonts.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 24 17:53:42 CEST 2007 - sndirsch@suse.de
+
+- move most important fonts to xorg-x11-fonts-core (Bug #293793) 
+
 -------------------------------------------------------------------
 Mon Feb 12 14:20:54 CET 2007 - sndirsch@suse.de
 

xorg-x11-fonts.spec

@@ -14,7 +14,7 @@ Name:           xorg-x11-fonts
 BuildRequires:  fontconfig freetype2 pkgconfig xorg-x11 xorg-x11-fonts-devel xorg-x11-libICE xorg-x11-libSM xorg-x11-libX11 xorg-x11-libXau xorg-x11-libXdmcp xorg-x11-libXext xorg-x11-libXfixes xorg-x11-libXmu xorg-x11-libXp xorg-x11-libXpm xorg-x11-libXprintUtil xorg-x11-libXrender xorg-x11-libXt xorg-x11-libXv xorg-x11-libfontenc xorg-x11-libs xorg-x11-libxkbfile xorg-x11-proto-devel
 Url:            http://xorg.freedesktop.org/
 Version:        7.2
-Release:        26
+Release:        60
 License:        X11/MIT
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -122,20 +122,10 @@ for dir in encodings-* $(ls | grep -v -e encodings -e alias) font-alias-* ; do
   make -C $dir install DESTDIR=$RPM_BUILD_ROOT
 done
 rm -f $RPM_BUILD_ROOT/usr/share/fonts/*/fonts.cache*
+rm -f $RPM_BUILD_ROOT/usr/share/fonts/75dpi/fonts.{dir,scale}
 pushd $RPM_BUILD_ROOT
-find . -type d | sed 's/^\./%dir /g' | grep -v \
+find usr/share/fonts/75dpi -type f | sed 's+^usr+/usr+g' | \
-  -e "^%dir /usr$" \
+  grep -v -e ISO8859 -e fonts.alias >> $RPM_BUILD_DIR/files.%{name}-core
-  -e "^%dir /usr/share$" \
-  -e "^%dir /usr/share/fonts$" \
-  -e "^%dir /usr/share/fonts/encodings$" \
-  -e "^%dir /usr/share/fonts/misc$" \
-  > $RPM_BUILD_DIR/files.%{name}
-find . -type f | sed 's/^\.//g' | grep -v \
-  -e "/usr/share/fonts/encodings" \
-  -e "^/usr/share/fonts/misc/6x13-ISO8859-1.pcf.gz$" \
-  -e "^/usr/share/fonts/misc/cursor.pcf.gz$" \
-  -e "^/usr/share/fonts/misc/fonts.alias$" \
- >>  $RPM_BUILD_DIR/files.%{name}
 popd
 
 %clean
@@ -153,19 +143,27 @@ rm -rf "$RPM_BUILD_ROOT"
 %postun core
 %run_suseconfig_fonts
 
-%files -f files.%{name}
+%files 
 %defattr(-,root,root)
+/usr/share/fonts/100dpi/
+/usr/share/fonts/75dpi/fonts.alias
+/usr/share/fonts/75dpi/*-ISO8859-*.pcf.gz
+/usr/share/fonts/Speedo/
+/usr/share/fonts/Type1/
+/usr/share/fonts/cyrillic/
+/usr/share/fonts/truetype/
 
-%files core
+%files core -f files.%{name}-core
 %defattr(-,root,root)
 %dir /usr/share/fonts/misc
+%dir /usr/share/fonts/75dpi
 %dir /usr/share/fonts/encodings
 /usr/share/fonts/encodings/*
-/usr/share/fonts/misc/6x13-ISO8859-1.pcf.gz
+/usr/share/fonts/misc/*
-/usr/share/fonts/misc/cursor.pcf.gz
-/usr/share/fonts/misc/fonts.alias
 
-%changelog -n xorg-x11-fonts
+%changelog
+* Tue Jul 24 2007 - sndirsch@suse.de
+- move most important fonts to xorg-x11-fonts-core (Bug #293793)
 * Mon Feb 12 2007 - sndirsch@suse.de
 - font-misc-ethiopic.diff:
   * don't install TTF fonts any longer; OTF fonts should be enough