Hello community,
here is the log from the commit of package fonts-config for openSUSE:Factory
checked in at 2012-08-08 11:10:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fonts-config (Old)
and /work/SRC/openSUSE:Factory/.fonts-config.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fonts-config", Maintainer is "pgaj...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/fonts-config/fonts-config.changes
2012-07-30 20:26:37.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.fonts-config.new/fonts-config.changes
2012-08-08 11:10:21.000000000 +0200
@@ -1,0 +2,10 @@
+Wed Aug 8 07:12:28 UTC 2012 - pgaj...@suse.com
+
+- call spec-cleaner
+
+-------------------------------------------------------------------
+Mon Aug 6 15:51:33 UTC 2012 - pgaj...@suse.com
+
+- prepare spec file for dropping SuSEconfig.fonts (openFATE#313536)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fonts-config.spec ++++++
--- /var/tmp/diff_new_pack.UPHLGp/_old 2012-08-08 11:10:21.000000000 +0200
+++ /var/tmp/diff_new_pack.UPHLGp/_new 2012-08-08 11:10:21.000000000 +0200
@@ -17,12 +17,6 @@
Name: fonts-config
-Provides: xf86tools:/usr/sbin/fonts-config
-Requires: fontconfig >= 2.3.93.20060103
-Requires: perl(English)
-Requires(pre): %suseconfig_fonts_prereq
-Recommends: ft2demos
-PreReq: %fillup_prereq
Version: 20080121
Release: 0
Summary: Configures Fonts for X Windows and other applications
@@ -36,8 +30,16 @@
Source6: suse-hinting.conf.template
Source7: suse-bitmaps.conf.template
Source8: suse-font-dirs.conf.template
-BuildArch: noarch
+BuildRequires: fontconfig
+BuildRequires: fontpackages-devel
+Requires(pre): %fillup_prereq
+Requires: fontconfig >= 2.3.93.20060103
+Requires: perl(English)
+Recommends: ft2demos
+Provides: xf86tools:/usr/sbin/fonts-config
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildArch: noarch
+%reconfigure_fonts_prereq
%description
Configures Fonts for X Windows and other applications.
@@ -52,43 +54,44 @@
%build
%install
-mkdir -p $RPM_BUILD_ROOT/sbin/conf.d
-mkdir -p $RPM_BUILD_ROOT/usr/sbin
-mkdir -p $RPM_BUILD_ROOT/usr/share/fonts-config
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
-mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
-install -m 755 $RPM_SOURCE_DIR/SuSEconfig.fonts $RPM_BUILD_ROOT/sbin/conf.d
-install -m 755 $RPM_SOURCE_DIR/fonts-config $RPM_BUILD_ROOT/usr/sbin
-install -m 644 $RPM_SOURCE_DIR/*.template
$RPM_BUILD_ROOT/usr/share/fonts-config
+mkdir -p %{buildroot}/sbin/conf.d
+mkdir -p %{buildroot}%{_prefix}/sbin
+mkdir -p %{buildroot}%{_datadir}/fonts-config
+mkdir -p %{buildroot}/%{_mandir}/man1
+mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
+install -m 755 $RPM_SOURCE_DIR/SuSEconfig.fonts %{buildroot}/sbin/conf.d
+install -m 755 $RPM_SOURCE_DIR/fonts-config %{buildroot}%{_prefix}/sbin
+install -m 644 $RPM_SOURCE_DIR/*.template %{buildroot}%{_datadir}/fonts-config
pod2man --section 1 --center=" " $RPM_SOURCE_DIR/fonts-config > \
- $RPM_BUILD_ROOT/%{_mandir}/man1/fonts-config.1
+ %{buildroot}/%{_mandir}/man1/fonts-config.1
install -m 644 $RPM_SOURCE_DIR/sysconfig.fonts-config \
- $RPM_BUILD_ROOT/var/adm/fillup-templates/
+ %{buildroot}%{_localstatedir}/adm/fillup-templates/
#
-mkdir -p $RPM_BUILD_ROOT/etc/fonts/conf.d
-mkdir -p $RPM_BUILD_ROOT/etc/fonts/conf.avail
-sed -e's/_BYTECODE_BW_MAX_PIXEL_/0/' %{S:6} \
- > $RPM_BUILD_ROOT/etc/fonts/conf.avail/12-suse-hinting-bc.conf
-sed -e's/_USE_EMBEDDED_BITMAPS_PLACEHOLDER_//' %{S:7} \
- > $RPM_BUILD_ROOT/etc/fonts/conf.avail/17-suse-bitmaps.conf
+mkdir -p %{buildroot}%{_fontsconfddir}
+mkdir -p %{buildroot}%{_fontsconfavaildir}
+sed -e's/_BYTECODE_BW_MAX_PIXEL_/0/' %{SOURCE6} \
+ > %{buildroot}%{_fontsconfavaildir}/12-suse-hinting-bc.conf
+sed -e's/_USE_EMBEDDED_BITMAPS_PLACEHOLDER_//' %{SOURCE7} \
+ > %{buildroot}%{_fontsconfavaildir}/17-suse-bitmaps.conf
ln -s ../conf.avail/12-suse-hinting-bc.conf \
- $RPM_BUILD_ROOT/etc/fonts/conf.d/12-suse-hinting-bc.conf
+ %{buildroot}%{_fontsconfddir}/12-suse-hinting-bc.conf
ln -s ../conf.avail/17-suse-bitmaps.conf \
- $RPM_BUILD_ROOT/etc/fonts/conf.d/17-suse-bitmaps.conf
+ %{buildroot}%{_fontsconfddir}/17-suse-bitmaps.conf
%post
%{fillup_only -n fonts-config}
-%run_suseconfig_fonts
+%reconfigure_fonts_post
exit 0
%files
%defattr(-,root,root)
-/usr/sbin/fonts-config
-%dir /usr/share/fonts-config/
-/usr/share/fonts-config/*
+%{_sbindir}/fonts-config
+%dir %{_datadir}/fonts-config/
+%{_datadir}/fonts-config/*
/sbin/conf.d/SuSEconfig.fonts
%{_mandir}/man1/fonts-config.1.gz
-/var/adm/fillup-templates/sysconfig.fonts-config
-/etc/fonts
+%{_localstatedir}/adm/fillup-templates/sysconfig.fonts-config
+%{_fontsconfavaildir}/*
+%{_fontsconfddir}/*
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
