commit fontpackages for openSUSE:Factory
Hello community,
here is the log from the commit of package fontpackages for openSUSE:Factory
checked in at 2017-11-23 09:35:33
Comparing /work/SRC/openSUSE:Factory/fontpackages (Old)
and /work/SRC/openSUSE:Factory/.fontpackages.new (New)
Package is "fontpackages"
Thu Nov 23 09:35:33 2017 rev:15 rq:544185 version:0.2
Changes:
--- /work/SRC/openSUSE:Factory/fontpackages/fontpackages.changes
2016-03-29 09:53:59.0 +0200
+++ /work/SRC/openSUSE:Factory/.fontpackages.new/fontpackages.changes
2017-11-23 09:35:36.015809644 +0100
@@ -1,0 +2,8 @@
+Tue Nov 21 15:14:15 CET 2017 - ku...@suse.de
+
+- /var/adm/update-scripts is deprecated and will be removed at
+ some point in the future, since %posttrans support in libzypp
+ was fixed with SLE12. Remove the workaround, only use the RPM
+ posttrans to simplify the code and testing.
+
+---
Other differences:
--
++ fontpackages.spec ++
--- /var/tmp/diff_new_pack.Td9i2S/_old 2017-11-23 09:35:36.791781332 +0100
+++ /var/tmp/diff_new_pack.Td9i2S/_new 2017-11-23 09:35:36.795781186 +0100
@@ -1,7 +1,7 @@
#
# spec file for package fontpackages
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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.Td9i2S/_old 2017-11-23 09:35:36.851779143 +0100
+++ /var/tmp/diff_new_pack.Td9i2S/_new 2017-11-23 09:35:36.855778997 +0100
@@ -10,7 +10,7 @@
# macro: link_avail_to_system_fontsconf name
# (takes exactly one argument, name of configuration file)
-# creates symlink pointing from /etc/fonts/conf.d/name to
+# creates symlink pointing from /etc/fonts/conf.d/name to
# ../../../usr/share/%{name}/conf.avail/name
%link_avail_to_system_fontsconf() \
if [ "x%1" == "x%%1" ]; then \
@@ -43,7 +43,7 @@
# macro: files_fontsconf_availdir
# packages /usr/share/%{name}/conf.avail directory,
-# which is intended for fontconfig files shipped by the
+# which is intended for fontconfig files shipped by the
# (font) package
%files_fontsconf_availdir() \
@@ -52,7 +52,7 @@
%nil
# macro: files_fontsconf_file
-# takes exactly one argument; for given fontconfig file
+# takes exactly one argument; for given fontconfig file
# (01-fontconfig.conf) macro expands in correct %%files entry
#
# -l option also packages %%{_fontsconfddir}/01-fontconfig.conf link
@@ -101,40 +101,12 @@
# 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} \
%{-c: \
touch %{__fontsconfigrunflag}-cjk \
} \
- if [ -n "$ZYPP_IS_RUNNING" ]; then \
-__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: \
-
__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
commit fontpackages for openSUSE:Factory
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.0 +0100
+++ /work/SRC/openSUSE:Factory/.fontpackages.new/fontpackages.changes
2016-03-29 09:53:59.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.w0SXFE/_new 2016-03-29 09:54:00.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.w0SXFE/_new 2016-03-29 09:54:00.0 +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" \
+
commit fontpackages for openSUSE:Factory
Hello community,
here is the log from the commit of package fontpackages for openSUSE:Factory
checked in at 2015-10-28 17:14:30
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-02-06 10:57:40.0 +0100
+++ /work/SRC/openSUSE:Factory/.fontpackages.new/fontpackages.changes
2015-10-28 17:14:31.0 +0100
@@ -1,0 +2,5 @@
+Wed Oct 21 09:27:48 UTC 2015 - dmuel...@suse.com
+
+- remove references to /var/run (bsc#951354)
+
+---
Other differences:
--
++ rpm-macros.fonts-config ++
--- /var/tmp/diff_new_pack.1FfCGf/_old 2015-10-28 17:14:32.0 +0100
+++ /var/tmp/diff_new_pack.1FfCGf/_new 2015-10-28 17:14:32.0 +0100
@@ -6,7 +6,7 @@
%_fontsconfddir %{_fontsconfdir}/conf.d
%_fontsconfavaildir %{_datadir}/%{name}/conf.avail
# private
-%__fontsconfigrunflag /var/run/fontpackages/reconfigure-fonts
+%__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
commit fontpackages for openSUSE:Factory
Hello community,
here is the log from the commit of package fontpackages for openSUSE:Factory
checked in at 2015-02-06 10:57:38
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-02-05 10:59:00.0 +0100
+++ /work/SRC/openSUSE:Factory/.fontpackages.new/fontpackages.changes
2015-02-06 10:57:40.0 +0100
@@ -1,0 +2,6 @@
+Thu Feb 5 11:16:17 UTC 2015 - o...@aepfle.de
+
+- Revert last pathname change because libzypp expects a fixed
+ filename pattern. release changes have to caught in build-compare
+
+---
Other differences:
--
++ rpm-macros.fonts-config ++
--- /var/tmp/diff_new_pack.z79dY0/_old 2015-02-06 10:57:41.0 +0100
+++ /var/tmp/diff_new_pack.z79dY0/_new 2015-02-06 10:57:41.0 +0100
@@ -7,8 +7,10 @@
%_fontsconfavaildir %{_datadir}/%{name}/conf.avail
# private
%__fontsconfigrunflag /var/run/fontpackages/reconfigure-fonts
-%__fontsupdatescript
/var/adm/update-scripts/reconfigure-fonts-%{name}-%{version}-%{release}
-%__fontsupdatescript_cjk
/var/adm/update-scripts/reconfigure-cjk-fonts-%{name}-%{version}-%{release}
+# 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)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fontpackages for openSUSE:Factory
Hello community,
here is the log from the commit of package fontpackages for openSUSE:Factory
checked in at 2015-02-05 10:58:59
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
2014-03-06 19:29:30.0 +0100
+++ /work/SRC/openSUSE:Factory/.fontpackages.new/fontpackages.changes
2015-02-05 10:59:00.0 +0100
@@ -1,0 +2,5 @@
+Tue Feb 3 08:24:45 UTC 2015 - o...@aepfle.de
+
+- Move version-release to reduce build-compare noise
+
+---
Other differences:
--
++ fontpackages.spec ++
--- /var/tmp/diff_new_pack.2xoD1k/_old 2015-02-05 10:59:01.0 +0100
+++ /var/tmp/diff_new_pack.2xoD1k/_new 2015-02-05 10:59:01.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package fontpackages
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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.2xoD1k/_old 2015-02-05 10:59:01.0 +0100
+++ /var/tmp/diff_new_pack.2xoD1k/_new 2015-02-05 10:59:01.0 +0100
@@ -7,7 +7,8 @@
%_fontsconfavaildir %{_datadir}/%{name}/conf.avail
# private
%__fontsconfigrunflag /var/run/fontpackages/reconfigure-fonts
-%__fontsupdatescript
/var/adm/update-scripts/%{name}-%{version}-%{release}-reconfigure-fonts
+%__fontsupdatescript
/var/adm/update-scripts/reconfigure-fonts-%{name}-%{version}-%{release}
+%__fontsupdatescript_cjk
/var/adm/update-scripts/reconfigure-cjk-fonts-%{name}-%{version}-%{release}
# macro: link_avail_to_system_fontsconf name
# (takes exactly one argument, name of configuration file)
@@ -117,16 +118,16 @@
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 \
+ 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
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fontpackages for openSUSE:Factory
Hello community, here is the log from the commit of package fontpackages for openSUSE:Factory checked in at 2014-03-06 19:29:29 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 2014-01-30 09:01:48.0 +0100 +++ /work/SRC/openSUSE:Factory/.fontpackages.new/fontpackages.changes 2014-03-06 19:29:30.0 +0100 @@ -1,0 +2,5 @@ +Thu Feb 27 15:48:37 UTC 2014 - pgaj...@suse.com + +- require coreutils for scriptlets of fontpackages [bnc#865853] + +--- Other differences: -- ++ rpm-macros.fonts-config ++ --- /var/tmp/diff_new_pack.gDy1hb/_old 2014-03-06 19:29:31.0 +0100 +++ /var/tmp/diff_new_pack.gDy1hb/_new 2014-03-06 19:29:31.0 +0100 @@ -69,6 +69,9 @@ # adds requires for fonts-config %reconfigure_fonts_prereq \ Requires(pre): perl aaa_base \ +Requires(post):coreutils \ +Requires(postun): coreutils \ +Requires(posttrans): coreutils \ %nil -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fontpackages for openSUSE:Factory
Hello community, here is the log from the commit of package fontpackages for openSUSE:Factory checked in at 2014-01-30 09:01:47 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 2013-10-18 11:38:35.0 +0200 +++ /work/SRC/openSUSE:Factory/.fontpackages.new/fontpackages.changes 2014-01-30 09:01:48.0 +0100 @@ -1,0 +2,5 @@ +Wed Jan 22 14:18:02 UTC 2014 - pgaj...@suse.com + +- fonts-config is --quiet in every call + +--- Other differences: -- ++ fontpackages.spec ++ --- /var/tmp/diff_new_pack.z2DOS2/_old 2014-01-30 09:01:49.0 +0100 +++ /var/tmp/diff_new_pack.z2DOS2/_new 2014-01-30 09:01:49.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package fontpackages # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products 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.z2DOS2/_old 2014-01-30 09:01:49.0 +0100 +++ /var/tmp/diff_new_pack.z2DOS2/_new 2014-01-30 09:01:49.0 +0100 @@ -77,7 +77,7 @@ %reconfigure_fonts \ if test -x /usr/sbin/fonts-config ; then \ LC_ALL=POSIX \ - /usr/sbin/fonts-config --verbose \ + /usr/sbin/fonts-config --quiet \ fi \ %nil -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fontpackages for openSUSE:Factory
Hello community,
here is the log from the commit of package fontpackages for openSUSE:Factory
checked in at 2013-10-18 11:31:51
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
2013-10-11 16:39:42.0 +0200
+++ /work/SRC/openSUSE:Factory/.fontpackages.new/fontpackages.changes
2013-10-18 11:38:35.0 +0200
@@ -1,0 +2,11 @@
+Tue Oct 15 11:16:42 UTC 2013 - pgaj...@suse.com
+
+- fixed minor typo in %reconfigure_fonts_post macro [bnc#845955]
+
+---
+Mon Oct 14 06:05:19 UTC 2013 - pgaj...@suse.com
+
+- minor fix in %reconfigure_fonts_post macro (really check for
+ cjk *-config before run them)
+
+---
Other differences:
--
++ rpm-macros.fonts-config ++
--- /var/tmp/diff_new_pack.amq78N/_old 2013-10-18 11:38:37.0 +0200
+++ /var/tmp/diff_new_pack.amq78N/_new 2013-10-18 11:38:37.0 +0200
@@ -115,13 +115,13 @@
echo 'rm %{__fontsupdatescript}' %{__fontsupdatescript} \
%{-c: \
echo 'if [ -e %{__fontsconfigrunflag}-cjk ]; then'
%{__fontsupdatescript}-cjk \
- echo ' if [ -x $adobecidfontconfig ]; 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 $ghostscriptcjkconfig ]; then'
%{__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} \
+ echo ' rm %{__fontsconfigrunflag}-cjk' %{__fontsupdatescript}-cjk \
echo 'fi' %{__fontsupdatescript}-cjk \
echo 'rm %{__fontsupdatescript}-cjk' %{__fontsupdatescript}-cjk \
} \
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fontpackages for openSUSE:Factory
Hello community,
here is the log from the commit of package fontpackages for openSUSE:Factory
checked in at 2013-10-11 16:39:41
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
2013-03-08 11:20:50.0 +0100
+++ /work/SRC/openSUSE:Factory/.fontpackages.new/fontpackages.changes
2013-10-11 16:39:42.0 +0200
@@ -1,0 +2,6 @@
+Mon Sep 30 08:44:46 UTC 2013 - pgaj...@suse.com
+
+- run fonts-config only once when installing or upgrading more
+ fonts in one transaction
+
+---
Other differences:
--
++ fontpackages.spec ++
--- /var/tmp/diff_new_pack.LTzou4/_old 2013-10-11 16:39:43.0 +0200
+++ /var/tmp/diff_new_pack.LTzou4/_new 2013-10-11 16:39:43.0 +0200
@@ -17,7 +17,7 @@
Name: fontpackages
-Version:0.1
+Version:0.2
Release:0
Summary:Commons for Font Packages
License:BSD-3-Clause
++ rpm-macros.fonts-config ++
--- /var/tmp/diff_new_pack.LTzou4/_old 2013-10-11 16:39:43.0 +0200
+++ /var/tmp/diff_new_pack.LTzou4/_new 2013-10-11 16:39:43.0 +0200
@@ -5,13 +5,16 @@
%_fontsconfdir %{_sysconfdir}/fonts
%_fontsconfddir %{_fontsconfdir}/conf.d
%_fontsconfavaildir %{_datadir}/%{name}/conf.avail
+# private
+%__fontsconfigrunflag /var/run/fontpackages/reconfigure-fonts
+%__fontsupdatescript
/var/adm/update-scripts/%{name}-%{version}-%{release}-reconfigure-fonts
# macro: link_avail_to_system_fontsconf name
# (takes exactly one argument, name of configuration file)
# creates symlink pointing from /etc/fonts/conf.d/name to
# ../../../usr/share/%{name}/conf.avail/name
%link_avail_to_system_fontsconf() \
- if test x%1 == x%%1; then \
+ if [ x%1 == x%%1 ]; then \
echo Missing argument in call to %%link_avail_to_system_fontsconf: name
of configuration file. \
false \
fi \
@@ -29,7 +32,7 @@
#4. link %{_fontsavaildir}/01-fonts.conf %{_fontsconfddir}
%install_fontsconf() \
- if test x%1 == x%%1; then \
+ if [ x%1 == x%%1 ]; then \
echo Missing argument in call to %%install_fontsconf: path and name of
configuration file. \
false \
fi \
@@ -68,33 +71,60 @@
Requires(pre): perl aaa_base \
%nil
+
# macro: reconfigure_fonts
# font setup for suse
-# options:
-# -c (the fonts are CJK fonts, also do setup which is only needed
-# for CJK)
-%reconfigure_fonts(c) \
+%reconfigure_fonts \
if test -x /usr/sbin/fonts-config ; then \
LC_ALL=POSIX \
/usr/sbin/fonts-config --verbose \
fi \
- %{-c: \
-if test -x /usr/sbin/acroread-cidfont-config ; then \
- /usr/sbin/acroread-cidfont-config \
-fi \
-if test -x /usr/sbin/ghostscript-cjk-config ; then \
-/usr/sbin/ghostscript-cjk-config \
-fi} \
%nil
+
+# macro: reconfigure_fonts
+# cjk font setup for suse
+%reconfigure_fonts_cjk \
+ if test -x /usr/sbin/acroread-cidfont-config ; then \
+ /usr/sbin/acroread-cidfont-config \
+ fi \
+ if test -x /usr/sbin/ghostscript-cjk-config ; then \
+ /usr/sbin/ghostscript-cjk-config \
+ fi \
+ %nil
+
+
# macro: reconfigure_fonts_post
# now alias to reconfigure_fonts, this can change in the future
# options:
# -c (the fonts are CJK fonts, also do setup which is only needed
# for CJK)
%reconfigure_fonts_post(c) \
- if [ $1 -ne 2 ]; then \
-%reconfigure_fonts c \
+ mkdir -p `dirname %{__fontsconfigrunflag}` \
+ touch %{__fontsconfigrunflag} \
+ %{-c: \
+ 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} \
+%{-c: \
+ echo 'if [ -e %{__fontsconfigrunflag}-cjk ]; then'
%{__fontsupdatescript}-cjk \
+ echo ' if [ -x $adobecidfontconfig ]; then'
%{__fontsupdatescript}-cjk \
+ echo '/usr/sbin/acroread-cidfont-config'
%{__fontsupdatescript}-cjk \
+ echo ' fi' %{__fontsupdatescript}-cjk \
+ echo ' if [ -x $ghostscriptcjkconfig ]; then'
%{__fontsupdatescript}-cjk \
+ echo '/usr/sbin/ghostscript-cjk-config'
%{__fontsupdatescript}-cjk \
commit fontpackages for openSUSE:Factory
Hello community,
here is the log from the commit of package fontpackages for openSUSE:Factory
checked in at 2013-03-08 10:49:28
Comparing /work/SRC/openSUSE:Factory/fontpackages (Old)
and /work/SRC/openSUSE:Factory/.fontpackages.new (New)
Package is fontpackages, Maintainer is pgaj...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/fontpackages/fontpackages.changes
2012-10-16 07:05:12.0 +0200
+++ /work/SRC/openSUSE:Factory/.fontpackages.new/fontpackages.changes
2013-03-08 10:49:29.0 +0100
@@ -1,0 +2,8 @@
+Wed Jan 2 09:25:45 UTC 2013 - pgaj...@suse.com
+
+- %reconfigure_fonts_scriptlets macro does not contain (now empty)
+ %posttrans from now on until
+ https://bugzilla.novell.com/show_bug.cgi?id=773575
+ is not resolved
+
+---
Other differences:
--
++ fontpackages.spec ++
--- /var/tmp/diff_new_pack.RRVJ3U/_old 2013-03-08 10:49:30.0 +0100
+++ /var/tmp/diff_new_pack.RRVJ3U/_new 2013-03-08 10:49:30.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package fontpackages
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products 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.RRVJ3U/_old 2013-03-08 10:49:30.0 +0100
+++ /var/tmp/diff_new_pack.RRVJ3U/_new 2013-03-08 10:49:30.0 +0100
@@ -129,8 +129,5 @@
%postun %{-n:-n %{-n*}} \
%reconfigure_fonts_postun c \
\
-%posttrans %{-n:-n %{-n*}} \
-%reconfigure_fonts_posttrans c \
-\
%nil
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit fontpackages for openSUSE:Factory
Hello community,
here is the log from the commit of package fontpackages for openSUSE:Factory
checked in at 2012-10-16 07:05:10
Comparing /work/SRC/openSUSE:Factory/fontpackages (Old)
and /work/SRC/openSUSE:Factory/.fontpackages.new (New)
Package is fontpackages, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/fontpackages/fontpackages.changes
2012-08-04 09:12:09.0 +0200
+++ /work/SRC/openSUSE:Factory/.fontpackages.new/fontpackages.changes
2012-10-16 07:05:12.0 +0200
@@ -1,0 +2,42 @@
+Mon Oct 8 12:39:33 UTC 2012 - pgaj...@suse.com
+
+- introduced new rpm macro: %files_fontsconf_availdir
+to be included in %files section of package which ships own
+fontconfig files; expands in
+/usr/share/%{name}
+/usr/share/%{name}/conf.avail
+- introduced new rpm macro: %files_fontsconf_file
+to be included in %files section of package which ships own
+fontconfig file;
+
+%files_fontsconf_file -l name.conf
+
+expands in
+/usr/share/%{name}/conf.avail/name.conf
+%config /etc/fonts/conf.d/name.conf
+
+when -l switch isn't supplied, only
+/usr/share/%{name}/conf.avail/name.conf
+is packaged
+
+---
+Tue Oct 2 15:34:14 UTC 2012 - pgaj...@suse.com
+
+- introduced new rpm macro: %install_fontsconf
+ for given file (path/to/01-font.conf), it
+1. creates %{_fontsconfavaildir}
+2. copies path/to/01-font.conf to %{_fontsconfavaildir}
+ uses %link_avail_to_system_fontsconf to
+3. create %{_fontsconfddir}
+4. link %{_fontsavaildir}/01-fonts.conf %{_fontsconfddir}
+
+---
+Tue Oct 2 11:33:46 UTC 2012 - pgaj...@suse.com
+
+- modified %_fontsconfavaildir to from
+ /etc/fonts/conf.avail to /usr/share/%{name}/conf.avail as
+ fontconfig 2.10 ship its avail conf in /usr/share/fontconfig/conf.avail
+- added %link_avail_to_system_fontsconf, which creates symlink pointing
+ from /etc/fonts/conf.d to ../../../usr/share/%{name}/conf.avail
+
+---
Other differences:
--
++ fontpackages.spec ++
--- /var/tmp/diff_new_pack.q0zYHB/_old 2012-10-16 07:05:15.0 +0200
+++ /var/tmp/diff_new_pack.q0zYHB/_new 2012-10-16 07:05:15.0 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package fontpackage
+# spec file for package fontpackages
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,8 +19,8 @@
Name: fontpackages
Version:0.1
Release:0
-License:BSD-3-Clause
Summary:Commons for Font Packages
+License:BSD-3-Clause
Group: System/Base
Source0:rpm-macros.fonts-config
Source100: COPYING
++ rpm-macros.fonts-config ++
--- /var/tmp/diff_new_pack.q0zYHB/_old 2012-10-16 07:05:15.0 +0200
+++ /var/tmp/diff_new_pack.q0zYHB/_new 2012-10-16 07:05:15.0 +0200
@@ -4,9 +4,66 @@
%_miscfontsdir %{_fontsdir}/misc
%_fontsconfdir %{_sysconfdir}/fonts
%_fontsconfddir %{_fontsconfdir}/conf.d
-%_fontsconfavaildir %{_fontsconfdir}/conf.avail
+%_fontsconfavaildir %{_datadir}/%{name}/conf.avail
-# package build macros
+# macro: link_avail_to_system_fontsconf name
+# (takes exactly one argument, name of configuration file)
+# creates symlink pointing from /etc/fonts/conf.d/name to
+# ../../../usr/share/%{name}/conf.avail/name
+%link_avail_to_system_fontsconf() \
+ if test x%1 == x%%1; then \
+echo Missing argument in call to %%link_avail_to_system_fontsconf: name
of configuration file. \
+false \
+ fi \
+ echo Linking available configuration in %{_fontsconfavaildir}/%1 to
%{_fontsconfddir}/%1 \
+ mkdir -p %{buildroot}%{_fontsconfddir} \
+ ln -s ../../..%{_fontsconfavaildir}/%1 %{buildroot}%{_fontsconfddir} \
+ %nil
+
+# macro: install_fontsconf
+# takes exactly one argument; for given file (path/to/01-font.conf), it
+#1. creates %{_fontsconfavaildir}
+#2. copies path/to/01-font.conf to %{_fontsconfavaildir}
+# uses %link_avail_to_system_fontsconf to
+#3. create %{_fontsconfddir}
+#4. link %{_fontsavaildir}/01-fonts.conf %{_fontsconfddir}
+
+%install_fontsconf() \
+ if test x%1 == x%%1; then \
+echo Missing argument in call to %%install_fontsconf: path and name of
configuration file. \
+false \
+ fi \
+ mkdir -p %{buildroot}%{_fontsconfavaildir} \
+ install -m 644 -p %1 %{buildroot}%{_fontsconfavaildir} \
+ conffile=`basename %1` \
+ %link_avail_to_system_fontsconf $conffile \
+ %nil
+
+# macro: files_fontsconf_availdir
+# packages /usr/share/%{name}/conf.avail directory,
+# which is intended for
