Hello community,
here is the log from the commit of package fontpackages for openSUSE:Factory
checked in at 2016-03-29 09:53:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fontpackages (Old)
and /work/SRC/openSUSE:Factory/.fontpackages.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fontpackages"
Changes:
--------
--- /work/SRC/openSUSE:Factory/fontpackages/fontpackages.changes
2015-10-28 17:14:31.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.fontpackages.new/fontpackages.changes
2016-03-29 09:53:59.000000000 +0200
@@ -1,0 +2,11 @@
+Mon Mar 14 14:30:28 UTC 2016 - pgaj...@suse.com
+
+- fix previous commit
+
+-------------------------------------------------------------------
+Mon Mar 7 15:36:53 UTC 2016 - o...@aepfle.de
+
+- Update reconfigure_fonts_post to use shell variables
+ to reduce build-compare noise in font packages
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fontpackages.spec ++++++
--- /var/tmp/diff_new_pack.w0SXFE/_old 2016-03-29 09:54:00.000000000 +0200
+++ /var/tmp/diff_new_pack.w0SXFE/_new 2016-03-29 09:54:00.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package fontpackages
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
++++++ rpm-macros.fonts-config ++++++
--- /var/tmp/diff_new_pack.w0SXFE/_old 2016-03-29 09:54:00.000000000 +0200
+++ /var/tmp/diff_new_pack.w0SXFE/_new 2016-03-29 09:54:00.000000000 +0200
@@ -7,10 +7,6 @@
%_fontsconfavaildir %{_datadir}/%{name}/conf.avail
# private
%__fontsconfigrunflag %{_rundir}/fontpackages/reconfigure-fonts
-# The pattern is fixed within libzypp:
-# /var/adm/update-scripts/name-version-release-anything
-%__fontsupdatescript
/var/adm/update-scripts/%{name}-%{version}-%{release}-reconfigure-fonts
-%__fontsupdatescript_cjk
/var/adm/update-scripts/%{name}-%{version}-%{release}-reconfigure-cjk-fonts
# macro: link_avail_to_system_fontsconf name
# (takes exactly one argument, name of configuration file)
@@ -105,6 +101,9 @@
# options:
# -c (the fonts are CJK fonts, also do setup which is only needed
# for CJK)
+# The pattern is fixed within libzypp:
+# /var/adm/update-scripts/name-version-release-anything
+# (place version-release at the end of a line to help build-compare)
%reconfigure_fonts_post(c) \
mkdir -p `dirname %{__fontsconfigrunflag}` \
touch %{__fontsconfigrunflag} \
@@ -112,24 +111,28 @@
touch %{__fontsconfigrunflag}-cjk \
} \
if [ -n "$ZYPP_IS_RUNNING" ]; then \
- echo 'if [ -e %{__fontsconfigrunflag} ]; then' > %{__fontsupdatescript} \
- echo ' if [ -x /usr/sbin/fonts-config ]; then' >> %{__fontsupdatescript}
\
- echo ' /usr/sbin/fonts-config --quiet' >> %{__fontsupdatescript} \
- echo ' fi' >> %{__fontsupdatescript} \
- echo ' rm %{__fontsconfigrunflag}' >> %{__fontsupdatescript} \
- echo 'fi' >> %{__fontsupdatescript} \
- echo 'rm %{__fontsupdatescript}' >> %{__fontsupdatescript} \
+ __fontsupdatescript=/var/adm/update-scripts/%{name}-%{version}-%{release}\
+ __fontsupdatescript="${__fontsupdatescript}-reconfigure-fonts" \
+ echo 'if [ -e %{__fontsconfigrunflag} ]; then' > "${__fontsupdatescript}"
\
+ echo ' if [ -x /usr/sbin/fonts-config ]; then' >>
"${__fontsupdatescript}" \
+ echo ' /usr/sbin/fonts-config --quiet' >> "${__fontsupdatescript}" \
+ echo ' fi' >> "${__fontsupdatescript}" \
+ echo ' rm %{__fontsconfigrunflag}' >> "${__fontsupdatescript}" \
+ echo 'fi' >> "${__fontsupdatescript}" \
+ echo "rm ${__fontsupdatescript}" >> "${__fontsupdatescript}" \
%{-c: \
- echo 'if [ -e %{__fontsconfigrunflag}-cjk ]; then' >
%{__fontsupdatescript_cjk} \
- echo ' if [ -x /usr/sbin/acroread-cidfont-config ]; then' >>
%{__fontsupdatescript_cjk} \
- echo ' /usr/sbin/acroread-cidfont-config' >>
%{__fontsupdatescript_cjk} \
- echo ' fi' >> %{__fontsupdatescript_cjk} \
- echo ' if [ -x /usr/sbin/ghostscript-cjk-config ]; then' >>
%{__fontsupdatescript_cjk} \
- echo ' /usr/sbin/ghostscript-cjk-config' >>
%{__fontsupdatescript_cjk} \
- echo ' fi' >> %{__fontsupdatescript_cjk} \
- echo ' rm %{__fontsconfigrunflag}-cjk' >> %{__fontsupdatescript_cjk} \
- echo 'fi' >> %{__fontsupdatescript_cjk} \
- echo 'rm %{__fontsupdatescript_cjk}' >> %{__fontsupdatescript_cjk} \
+
__fontsupdatescript_cjk=/var/adm/update-scripts/%{name}-%{version}-%{release}\
+
__fontsupdatescript_cjk="${__fontsupdatescript_cjk}-reconfigure-cjk-fonts" \
+ echo 'if [ -e %{__fontsconfigrunflag}-cjk ]; then' >
"${__fontsupdatescript_cjk}" \
+ echo ' if [ -x /usr/sbin/acroread-cidfont-config ]; then' >>
"${__fontsupdatescript_cjk}" \
+ echo ' /usr/sbin/acroread-cidfont-config' >>
"${__fontsupdatescript_cjk}" \
+ echo ' fi' >> "${__fontsupdatescript_cjk}" \
+ echo ' if [ -x /usr/sbin/ghostscript-cjk-config ]; then' >>
"${__fontsupdatescript_cjk}" \
+ echo ' /usr/sbin/ghostscript-cjk-config' >>
"${__fontsupdatescript_cjk}" \
+ echo ' fi' >> "${__fontsupdatescript_cjk}" \
+ echo ' rm %{__fontsconfigrunflag}-cjk' >> "${__fontsupdatescript_cjk}"
\
+ echo 'fi' >> "${__fontsupdatescript_cjk}" \
+ echo "rm ${__fontsupdatescript_cjk}" >> "${__fontsupdatescript_cjk}" \
} \
fi \
%nil
