- removed xft1 package <- what uses it at all?

- clean up of unused xft/fontconfig/render/xrender/xcursor subpackages

Changed files:
    XFree86.spec -> 1.476

diff --git a/XFree86.spec b/XFree86.spec
index 362cbbaaf8e642e98125b5e47869ca9a06ffba37..b8c52907f0a04ba4547b1780ca3ec820e0d5435f 100644 (file)
--- a/XFree86.spec
+++ b/XFree86.spec
@@ -329,231 +329,6 @@ X-Window Display PostScript static libraries.
 %description DPS-static -l pl
 Statyczne biblioteki X-Window Display PostScript.
 
-%package xft1
-Summary:       Old version of font rendering library
-Summary(pl):   Stara wersja biblioteki wy¶wietlaj±cej fonty
-Group:         X11/XFree86
-Requires:      %{name}-libs = %{version}
-Requires:      %{name}-xrender = %{version}
-Obsoletes:     XFree86-xft < 4.2.99
-
-%description xft1
-Old version of font rendering library.
-
-%description xft1 -l pl
-Stara wersja biblioteki wy¶wietlaj±cej fonty.
-
-%package xft
-Summary:       X Font rendering library
-Summary(pl):   Biblioteka do renderowania fontów
-Group:         X11/XFree86
-Requires:      %{name}-fontconfig = %{version}
-Requires:      %{name}-libs = %{version}
-Requires:      %{name}-xrender = %{version}
-Provides:      Xft = 2.1-2
-Obsoletes:     XFree86-xft2
-Obsoletes:     Xft
-
-%description xft
-Xft is a font rendering library for X.
-
-%description xft -l pl
-Xft jest bibliotek± s³u¿±c± do renderowania fontów dla X Window.
-
-%package xft-devel
-Summary:       Header files for X Font Rendering library
-Summary(pl):   Pliki nag³ówkowe dla biblioteki do renderowania fontów
-Group:         X11/Development/Libraries
-Requires:      %{name}-xft = %{version}
-Requires:      %{name}-fontconfig-devel = %{version}
-Requires:      %{name}-xrender-devel = %{version}
-Provides:      Xft-devel = 2.1-2
-Obsoletes:     XFree86-xft2-devel
-Obsoletes:     Xft-devel
-
-%description xft-devel
-Xft is a font rendering library for X.
-
-This package contains the header files needed to develop programs that
-use these Xft.
-
-%description xft-devel -l pl
-Xft jest bibliotek± s³u¿±c± do renderowania fontów dla X Window.
-
-Ten pakiet zawiera pliki nag³ówkowe potrzebne do kompilowania
-programów korzystaj±cych z biblioteki Xft.
-
-%package xft-static
-Summary:       X Font Rendering static library
-Summary(pl):   Statyczna biblioteka do renderowania fontów
-Group:         X11/Development/Libraries
-Requires:      %{name}-xft-devel = %{version}
-Provides:      Xft-static = 2.1-2
-Obsoletes:     XFree86-xft2-static
-Obsoletes:     Xft-static
-
-%description xft-static
-Xft is a font rendering library for X.
-
-This package contains static libraries.
-
-%description xft-static -l pl
-Xft jest bibliotek± s³u¿±c± do renderowania fontów dla X Window.
-
-Ten pakiet zawiera biblioteki statyczne.
-
-%package fontconfig
-Summary:       Font configuration and customization library
-Summary(pl):   Biblioteka do konfigurowania fontów
-Group:         Libraries
-Requires(post):        /sbin/ldconfig
-Requires:      %{name}-libs = %{version}
-Provides:      %{name}-fontconfig-realpkg = %{version}
-Provides:      fontconfig = 1.0.1
-Obsoletes:     fontconfig
-
-%description fontconfig
-Fontconfig is designed to locate fonts within the system and select
-them according to requirements specified by applications.
-
-%description fontconfig -l pl
-Fontconfig jest biblioteka przeznaczon± do lokalizowania fontów w
-systemie i wybierania ich w zale¿no¶ci od potrzeb aplikacji.
-
-%package fontconfig-devel
-Summary:       Header files for font configuration and customization library
-Summary(pl):   Pliki nag³ówkowe dla biblioteki do konfigurowania fontów
-Group:         Development/Libraries
-Requires:      %{name}-fontconfig-realpkg = %{version}
-Requires:      freetype-devel
-Provides:      %{name}-fontconfig-devel-realpkg = %{version}
-Provides:      fontconfig-devel = 1.0.1
-Obsoletes:     fontconfig-devel
-
-%description fontconfig-devel
-Fontconfig is designed to locate fonts within the system and select
-them according to requirements specified by applications.
-
-This package contains the header files needed to develop programs that
-use these fontconfig.
-
-%description fontconfig-devel -l pl
-Fontconfig jest biblioteka przeznaczon± do lokalizowania fontów w
-systemie i wybierania ich w zale¿no¶ci od potrzeb aplikacji.
-
-Ten pakiet zawiera pliki nag³ówkowe potrzebne do kompilowania
-programów korzystaj±cych z biblioteki fontconfig.
-
-%package fontconfig-static
-Summary:       Font configuration and customization static library
-Summary(pl):   Statyczna biblioteka do konfigurowania fontów
-Group:         Development/Libraries
-Requires:      %{name}-fontconfig-devel-realpkg = %{version}
-Provides:      fontconfig-static = 1.0.1
-Obsoletes:     fontconfig-static
-
-%description fontconfig-static
-Fontconfig is designed to locate fonts within the system and select
-them according to requirements specified by applications.
-
-This package contains static libraries.
-
-%description fontconfig-static -l pl
-Fontconfig jest biblioteka przeznaczon± do lokalizowania fontów w
-systemie i wybierania ich w zale¿no¶ci od potrzeb aplikacji.
-
-Ten pakiet zawiera biblioteki statyczne.
-
-%package render
-Summary:       X Render Extension
-Summary(pl):   Rozszerzenie X Render
-Group:         X11/Development/Libraries
-Requires:      XFree86-devel
-
-%description render
-This package contains header files and documentation for the X render
-extension.  Library and server implementations are separate.
-
-%description render -l pl
-Pakiet zawiera pliki nag³ówkowe i dokumenetacjê dla rozszerzenia
-X render. Biblioteka i implementacja serwera znajduj± siê w osobnym
-pakiecie.
-
-%package xrender
-Summary:       X Render Extension
-Summary(pl):   Rozszerzenie X Render
-Group:         X11/Libraries
-Requires:      %{name}-libs = %{version}
-
-%description xrender
-X render library.
-
-%description xrender -l pl
-Biblioteka X render.
-
-%package xrender-devel
-Summary:       X Render Extension headers
-Summary(pl):   Pliki nag³ówkowe rozszerzenia X Render
-Group:         X11/Libraries
-Requires:      %{name}-devel = %{version}
-Requires:      %{name}-render = %{version}
-Requires:      %{name}-xrender = %{version}
-
-%description xrender-devel
-X render library headers.
-
-%description xrender-devel -l pl
-Pliki nag³ówkowe biblioteki X render.
-
-%package xrender-static
-Summary:       X Render static library
-Summary(pl):   Biblioteka statyczna X render
-Group:         X11/Libraries/Development
-Requires:      %{name}-xrender-devel = %{version}
-
-%description xrender-static
-X render static library.
-
-%description xrender-static -l pl
-Biblioteka statyczna X render.
-
-%package xcursor
-Summary:       X cursor library
-Summary(pl):   Biblioteka X cursor
-Group:         X11/Libraries
-Requires:      %{name}-libs = %{version}
-
-%description xcursor
-X cursor library.
-
-%description xcursor -l pl
-Biblioteka X cursor.
-
-%package xcursor-devel
-Summary:       X cursor library headers
-Summary(pl):   Pliki nag³ówkowe biblioteki X cursor
-Group:         X11/Libraries/Development
-Requires:      %{name}-devel = %{version}
-Requires:      %{name}-xcursor = %{version}
-
-%description xcursor-devel
-X cursor library headers.
-
-%description xcursor-devel -l pl
-Pliki nag³ówkowe biblioteki X cursor.
-
-%package xcursor-static
-Summary:       X cursor static library
-Summary(pl):   Biblioteka statyczna X cursor
-Group:         X11/Libraries/Development
-Requires:      %{name}-xcursor-devel = %{version}
-
-%description xcursor-static
-X cursor static library.
-
-%description xcursor-static -l pl
-Biblioteka statyczna X cursor.
-
 %package OpenGL-core
 Summary:       OpenGL support for X11R6
 Summary(pl):   Wsparcie OpenGL dla systemu X11R6
@@ -2578,76 +2353,6 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libXft.so.1.1
 
-#%files xft
-#%defattr(644,root,root,755)
-#%attr(755,root,root) %{_libdir}/libXft.so.2.1
-
-#%files xft-devel
-#%defattr(644,root,root,755)
-#%attr(755,root,root) %{_bindir}/xft-config
-#%{_includedir}/X11/Xft
-#%{_libdir}/libXft.so
-#%{_mandir}/man3/Xft.3*
-#%{_pkgconfigdir}/xft.pc
-
-#%files xft-static
-#%defattr(644,root,root,755)
-#%{_libdir}/libXft.a
-
-#%files fontconfig
-#%defattr(644,root,root,755)
-#%dir %{_sysconfdir}/fonts
-#%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/fonts/fonts.conf
-#%{_sysconfdir}/fonts/fonts.dtd
-#%attr(755,root,root) %{_bindir}/fc-*
-#%attr(755,root,root) %{_libdir}/libfontconfig.so.1.0
-#%{_mandir}/man1/fc-*.1*
-
-#%files fontconfig-devel
-#%defattr(644,root,root,755)
-##%attr(755,root,root) %{_bindir}/fontconfig-config
-#%{_includedir}/fontconfig
-#%{_libdir}/libfontconfig.so
-##%{_pkgconfigdir}/fontconfig.pc
-#%{_mandir}/man3/fontconfig.3*
-
-#%files fontconfig-static
-#%defattr(644,root,root,755)
-#%{_libdir}/libfontconfig.a
-
-#%files render
-#%defattr(644,root,root,755)
-#%{_includedir}/X11/extensions/render.h
-#%{_includedir}/X11/extensions/renderproto.h
-
-#%files xrender
-#%defattr(644,root,root,755)
-#%attr(755,root,root) %{_libdir}/libXrender.so.*.*
-
-#%files xrender-devel
-#%defattr(644,root,root,755)
-#%attr(755,root,root) %{_libdir}/libXrender.so
-#%{_includedir}/X11/extensions/Xrender.h
-
-#%files xrender-static
-#%defattr(644,root,root,755)
-#%{_libdir}/libXrender.a
-
-#%files xcursor
-#%defattr(644,root,root,755)
-#%attr(755,root,root) %{_libdir}/libXcursor.so.*.*
-
-#%files xcursor-devel
-#%defattr(644,root,root,755)
-#%attr(755,root,root) %{_bindir}/xcursor-config
-#%attr(755,root,root) %{_libdir}/libXcursor.so
-#%{_includedir}/X11/Xcursor
-#%{_pkgconfigdir}/xcursor.pc
-
-#%files xcursor-static
-#%defattr(644,root,root,755)
-#%{_libdir}/libXcursor.a
-
 %files OpenGL-core
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/glxgears