[pango] fix up scriptlet dependencies
by Matthias Clasen
commit 7cabdcee20a1f4bd221ba21d3ec612cec2847c8b
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Sat May 19 01:20:29 2012 -0400
fix up scriptlet dependencies
pango.spec | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
---
diff --git a/pango.spec b/pango.spec
index 0f23901..800bc7b 100644
--- a/pango.spec
+++ b/pango.spec
@@ -9,7 +9,7 @@
Summary: System for layout and rendering of internationalized text
Name: pango
Version: 1.30.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
#VCS: git:git://git.gnome.org/pango
@@ -21,6 +21,8 @@ Requires: freetype >= %{freetype_version}
Requires: freetype >= %{freetype_version}
Requires: cairo >= %{cairo_version}
Requires: libthai >= %{libthai_version}
+Requires(post): sed
+Requires(postun): sed
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: pkgconfig >= %{pkgconfig_version}
BuildRequires: freetype-devel >= %{freetype_version}
@@ -166,14 +168,7 @@ host=`echo $host | sed "s/^ppc/powerpc/"`
# autoconf uses ibm-linux not redhat-linux on s390x
host=`echo $host | sed "s/^s390\(x\)*-redhat/s390\1-ibm/"`
-case "$host" in
- alpha*|ia64*|powerpc64*|s390x*|sparc64*|x86_64*)
- %{_bindir}/pango-querymodules-64 > %{_sysconfdir}/pango/$host/pango.modules
- ;;
- *)
- %{_bindir}/pango-querymodules-32 > %{_sysconfdir}/pango/$host/pango.modules
- ;;
-esac
+%{_bindir}/pango-querymodules-%{__isa_bits} > %{_sysconfdir}/pango/$host/pango.modules || :
%postun
/sbin/ldconfig
@@ -196,14 +191,7 @@ host=`echo $host | sed "s/^ppc/powerpc/"`
# autoconf uses ibm-linux not redhat-linux (s390x)
host=`echo $host | sed "s/^s390\(x\)*-redhat/s390\1-ibm/"`
-case "$host" in
- alpha*|ia64*|powerpc64*|s390x*|sparc64*|x86_64*)
- %{_bindir}/pango-querymodules-64 > %{_sysconfdir}/pango/$host/pango.modules || :
- ;;
- *)
- %{_bindir}/pango-querymodules-32 > %{_sysconfdir}/pango/$host/pango.modules || :
- ;;
-esac
+%{_bindir}/pango-querymodules-%{__isa_bits} > %{_sysconfdir}/pango/$host/pango.modules || :
fi
@@ -238,6 +226,9 @@ fi
%changelog
+* Sat May 19 2012 Matthias Clasen <mclasen(a)redhat.com> - 1.30.0-2
+- Fix up scriptlet dependencies (#684729)
+
* Wed Mar 28 2012 Richard Hughes <hughsient(a)gmail.com> - 1.30.0-1
- Update to 1.30.0
12 years
rpmguard: PASSED; 0 warnings for pango-1.30.0-2.fc18
by autoqa@fedoraproject.org
========================================================================
AutoQA Rpmguard Test Results
------------------------------------------------------------------------
ID pango-1.30.0-2.fc18
Result PASSED
Summary 0 warnings
Architecture all
Test ended 2012-05-19 05:08:21 UTC
This is just an overview extract of the test results, please see the log for more details:
http://autoqa.fedoraproject.org/report/979w
12 years
[Bug 613154] CVE-2010-2497 freetype: integer underflow vulnerability
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
https://bugzilla.redhat.com/show_bug.cgi?id=613154
Ramon de C Valle <rcvalle(a)redhat.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status Whiteboard|public=20100609,reported=20 |public=20100609,reported=20
|100702,source=vendorsec,imp |100702,source=vendorsec,imp
|act=important,cvss2=7.5/AV: |act=important,cvss2=7.5/AV:
|N/AC:L/Au:N/C:P/I:P/A:P,rhe |N/AC:L/Au:N/C:P/I:P/A:P,rhe
|l-6/freetype=affected,fedor |l-6/freetype=affected,fedor
|a-all/freetype=affected,cwe |a-all/freetype=affected,cwe
|=CWE-189/CWE-119 |=CWE-190
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
12 years
[fontconfig/f17] Add grep and coreutils to Requires(post). (#821957)
by Akira TAGOH
commit 6d110a71d8750f54bb392b6f5054a1a5305f8c86
Author: Akira TAGOH <tagoh(a)redhat.com>
Date: Wed May 16 12:34:10 2012 +0900
Add grep and coreutils to Requires(post). (#821957)
fontconfig.spec | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/fontconfig.spec b/fontconfig.spec
index e1ec88f..e2091b8 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -3,7 +3,7 @@
Summary: Font configuration and customization library
Name: fontconfig
Version: 2.8.0
-Release: 6%{?dist}
+Release: 7%{?dist}
License: MIT
Group: System Environment/Libraries
Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -24,6 +24,7 @@ BuildRequires: fontpackages-devel
Requires: fontpackages-filesystem
Requires(pre): freetype
+Requires(post): grep coreutils
%description
Fontconfig is designed to locate fonts within the
@@ -128,6 +129,9 @@ fi
%{_mandir}/man3/*
%changelog
+* Wed May 16 2012 Akira TAGOH <tagoh(a)redhat.com> - 2.8.0-7
+- Add grep and coreutils to Requires(post). (#821957)
+
* Fri Mar 23 2012 Akira TAGOH <tagoh(a)redhat.com> - 2.8.0-6
- Updates orth files. (#790471, #790460, #757985, #586763)
- Drop the apple roman cmap support. (#681808)
12 years
[fontconfig] typo
by Akira TAGOH
commit e4133ef900cb3c66960ed75d1343e70c60dc98f5
Author: Akira TAGOH <tagoh(a)redhat.com>
Date: Wed May 16 12:22:49 2012 +0900
typo
fontconfig.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/fontconfig.spec b/fontconfig.spec
index a7bfcc7..324e920 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -124,7 +124,7 @@ fi
%{_mandir}/man3/*
%changelog
-* Wed may 16 2012 Akira TAGOH <tagoh(a)redhat.com> - 2.9.0-2
+* Wed May 16 2012 Akira TAGOH <tagoh(a)redhat.com> - 2.9.0-2
- Add grep and coreutils to Requires(post). (#821957)
* Fri Mar 23 2012 Akira TAGOH <tagoh(a)redhat.com>
12 years
[fontconfig] Add grep and coreutils to Requires(post). (#821957)
by Akira TAGOH
commit 5fb5f5f4808520a0cdddc8d748be49a53bcd51bb
Author: Akira TAGOH <tagoh(a)redhat.com>
Date: Wed May 16 12:22:17 2012 +0900
Add grep and coreutils to Requires(post). (#821957)
fontconfig-2.9.0-result.patch | 75 +++++++++++++++++++++++++++++++++++++++++
fontconfig.spec | 12 ++++++-
2 files changed, 86 insertions(+), 1 deletions(-)
---
diff --git a/fontconfig-2.9.0-result.patch b/fontconfig-2.9.0-result.patch
new file mode 100644
index 0000000..666cea1
--- /dev/null
+++ b/fontconfig-2.9.0-result.patch
@@ -0,0 +1,75 @@
+From 92ac054ce5e270f22a4f81a09522c3f03b76c876 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira(a)tagoh.org>
+Date: Thu, 22 Mar 2012 19:15:27 +0900
+Subject: [PATCH] fcmatch: Set FcResultMatch at the end if the return value is
+ valid.
+
+In the previous code, the result of 'result' in the argument for
+FcFontSetSort() and FcFontSetMatch() wasn't predictable and not reliable to
+check if the return value is valid or not. this change is to ensure if it's
+performed successfully.
+---
+ src/fcmatch.c | 19 ++++++++++++++-----
+ 1 files changed, 14 insertions(+), 5 deletions(-)
+
+diff --git a/src/fcmatch.c b/src/fcmatch.c
+index 422bc38..92e4a66 100644
+--- a/src/fcmatch.c
++++ b/src/fcmatch.c
+@@ -501,11 +501,11 @@ FcFontSetMatchInternal (FcConfig *config,
+ printf ("\n");
+ FcPatternPrint (best);
+ }
+- if (!best)
+- {
+- *result = FcResultNoMatch;
+- return 0;
+- }
++ /* assuming that 'result' is initialized with FcResultNoMatch
++ * outside this function */
++ if (best)
++ *result = FcResultMatch;
++
+ return best;
+ }
+
+@@ -522,6 +522,8 @@ FcFontSetMatch (FcConfig *config,
+ assert (p != NULL);
+ assert (result != NULL);
+
++ *result = FcResultNoMatch;
++
+ if (!config)
+ {
+ config = FcConfigGetCurrent ();
+@@ -547,6 +549,8 @@ FcFontMatch (FcConfig *config,
+ assert (p != NULL);
+ assert (result != NULL);
+
++ *result = FcResultNoMatch;
++
+ if (!config)
+ {
+ config = FcConfigGetCurrent ();
+@@ -826,6 +830,9 @@ FcFontSetSort (FcConfig *config,
+ printf ("First font ");
+ FcPatternPrint (ret->fonts[0]);
+ }
++ if (ret->nfont > 0)
++ *result = FcResultMatch;
++
+ return ret;
+
+ bail2:
+@@ -849,6 +856,8 @@ FcFontSort (FcConfig *config,
+ assert (p != NULL);
+ assert (result != NULL);
+
++ *result = FcResultNoMatch;
++
+ if (!config)
+ {
+ config = FcConfigGetCurrent ();
+--
+1.7.7.6
+
diff --git a/fontconfig.spec b/fontconfig.spec
index e266bbd..a7bfcc7 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -3,7 +3,7 @@
Summary: Font configuration and customization library
Name: fontconfig
Version: 2.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: MIT
Group: System Environment/Libraries
Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -11,6 +11,7 @@ URL: http://fontconfig.org
Source1: 25-no-bitmap-fedora.conf
Patch0: fontconfig-2.8.0-sleep-less.patch
+Patch1: fontconfig-2.9.0-result.patch
BuildRequires: expat-devel
BuildRequires: freetype-devel >= %{freetype_version}
@@ -19,6 +20,7 @@ BuildRequires: fontpackages-devel
Requires: fontpackages-filesystem
Requires(pre): freetype
+Requires(post): grep coreutils
%description
Fontconfig is designed to locate fonts within the
@@ -42,6 +44,7 @@ will use fontconfig.
%prep
%setup -q
%patch0 -p1 -b .sleep-less
+%patch1 -p1 -b .result
%build
# update autotools stuff to avoid rpath definition.
@@ -121,6 +124,13 @@ fi
%{_mandir}/man3/*
%changelog
+* Wed may 16 2012 Akira TAGOH <tagoh(a)redhat.com> - 2.9.0-2
+- Add grep and coreutils to Requires(post). (#821957)
+
+* Fri Mar 23 2012 Akira TAGOH <tagoh(a)redhat.com>
+- backport patch to make 'result' from FcFontMatch() and FcFontSort()
+ more reliable.
+
* Wed Mar 21 2012 Akira TAGOH <tagoh(a)redhat.com> - 2.9.0-1
- New upstream release (#803559)
- Update ks.orth (#790471)
12 years
rpmguard: INFO; 2 warnings for fontconfig-2.9.0-2.fc18
by autoqa@fedoraproject.org
========================================================================
AutoQA Rpmguard Test Results
------------------------------------------------------------------------
ID fontconfig-2.9.0-2.fc18
Result INFO
Summary 2 warnings
Architecture all
Test ended 2012-05-16 03:09:00 UTC
This is just an overview extract of the test results, please see the log for more details:
http://autoqa.fedoraproject.org/report/8v50
12 years