[fontconfig] New upstream release.
by Akira TAGOH
commit f8b4e4831396a358aec74ccba69b4777df89b793
Author: Akira TAGOH <tagoh(a)redhat.com>
Date: Mon May 20 18:27:30 2013 +0900
New upstream release.
fontconfig.spec | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
---
diff --git a/fontconfig.spec b/fontconfig.spec
index 5f61e55..5116b96 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -57,8 +57,6 @@ which is useful for developing applications that uses fontconfig.
%prep
%setup -q
%patch0 -p1 -b .sleep-less
-%patch1 -p1
-%patch2 -p1
%build
# We don't want to rebuild the docs, but we want to install the included ones.
11 years, 1 month
[fontconfig] New upstream release.
by Akira TAGOH
commit b4a113bdc2a764ee46732a939623efc63b11f301
Author: Akira TAGOH <tagoh(a)redhat.com>
Date: Mon May 20 18:25:33 2013 +0900
New upstream release.
.gitignore | 1 +
fontconfig-929372.patch | 63 ------------------
fontconfig-fix-woff.patch | 157 ---------------------------------------------
fontconfig.spec | 9 ++-
sources | 2 +-
5 files changed, 7 insertions(+), 225 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e6e0978..f656da5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ fontconfig-2.8.0.tar.gz
/fontconfig-2.10.2.tar.bz2
/fontconfig-2.10.91.tar.bz2
/fontconfig-2.10.92.tar.bz2
+/fontconfig-2.10.93.tar.bz2
diff --git a/fontconfig.spec b/fontconfig.spec
index 9af8b58..5f61e55 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -2,8 +2,8 @@
Summary: Font configuration and customization library
Name: fontconfig
-Version: 2.10.92
-Release: 3%{?dist}
+Version: 2.10.93
+Release: 1%{?dist}
# src/ftglue.[ch] is in Public Domain
# src/fccache.c contains Public Domain code
# fc-case/CaseFolding.txt is in the UCD
@@ -16,8 +16,6 @@ Source1: 25-no-bitmap-fedora.conf
# https://bugzilla.redhat.com/show_bug.cgi?id=140335
Patch0: fontconfig-2.8.0-sleep-less.patch
-Patch1: %{name}-929372.patch
-Patch2: %{name}-fix-woff.patch
BuildRequires: expat-devel
BuildRequires: freetype-devel >= %{freetype_version}
@@ -137,6 +135,9 @@ fi
%doc fontconfig-devel.txt fontconfig-devel
%changelog
+* Mon May 20 2013 Akira TAGOH <tagoh(a)redhat.com> - 2.10.93-1
+- New upstream release.
+
* Thu Apr 11 2013 Akira TAGOH <tagoh(a)redhat.com> - 2.10.92-3
- Fix a web font issue in firefox. (#946859)
diff --git a/sources b/sources
index 3b0944c..b9a95d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d69aa42da134038d2145d8f31a085620 fontconfig-2.10.92.tar.bz2
+0f8e5c63c2d6931626185c02802375a3 fontconfig-2.10.93.tar.bz2
11 years, 1 month
Broken dependencies: fontforge
by Fedora Koji Build System
fontforge has broken dependencies in the epel-5 tree:
On x86_64:
fontforge-20080828-1.1.el5.i386 requires libpython2.4.so.1.0
Please resolve this as soon as possible.
11 years, 1 month
Broken dependencies: fontforge
by Fedora Koji Build System
fontforge has broken dependencies in the epel-5 tree:
On x86_64:
fontforge-20080828-1.1.el5.i386 requires libpython2.4.so.1.0
Please resolve this as soon as possible.
11 years, 1 month
[freetype/f19] Change encoding of "docs/tutorial/example3.cpp" to UTF-8
by mkasik
commit bd05ad14cde51f94e02b552f22c196330fb92122
Author: Marek Kasik <mkasik(a)redhat.com>
Date: Thu May 16 16:10:16 2013 +0200
Change encoding of "docs/tutorial/example3.cpp" to UTF-8
freetype.spec | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/freetype.spec b/freetype.spec
index ce4f709..d18dae1 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -7,7 +7,7 @@
Summary: A free and portable font rendering engine
Name: freetype
Version: 2.4.11
-Release: 4%{?dist}
+Release: 5%{?dist}
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
Group: System Environment/Libraries
URL: http://www.freetype.org
@@ -104,11 +104,15 @@ make TOP_DIR=".."
popd
%endif
-# Convert FTL.txt to UTF-8
+# Convert FTL.txt and example3.cpp to UTF-8
pushd docs
iconv -f latin1 -t utf-8 < FTL.TXT > FTL.TXT.tmp && \
touch -r FTL.TXT FTL.TXT.tmp && \
mv FTL.TXT.tmp FTL.TXT
+
+iconv -f iso-8859-1 -t utf-8 < "tutorial/example3.cpp" > "tutorial/example3.cpp.utf8"
+touch -r tutorial/example3.cpp tutorial/example3.cpp.utf8 && \
+mv tutorial/example3.cpp.utf8 tutorial/example3.cpp
popd
@@ -206,6 +210,9 @@ rm -rf $RPM_BUILD_ROOT
%doc docs/tutorial
%changelog
+* Thu May 16 2013 Marek Kasik <mkasik(a)redhat.com> - 2.4.11-5
+- Change encoding of "docs/tutorial/example3.cpp" to UTF-8
+
* Thu May 16 2013 Marek Kasik <mkasik(a)redhat.com> - 2.4.11-4
- Package ftconfig.h as source file
11 years, 1 month
[freetype/f19] Package ftconfig.h as source file
by mkasik
commit 03321fe15dd82c839dc44d97fa1081e3e034ebf2
Author: Marek Kasik <mkasik(a)redhat.com>
Date: Thu May 16 16:09:10 2013 +0200
Package ftconfig.h as source file
freetype.spec | 23 ++++++-----------------
ftconfig.h | 14 ++++++++++++++
2 files changed, 20 insertions(+), 17 deletions(-)
---
diff --git a/freetype.spec b/freetype.spec
index 1657990..ce4f709 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -7,13 +7,14 @@
Summary: A free and portable font rendering engine
Name: freetype
Version: 2.4.11
-Release: 3%{?dist}
+Release: 4%{?dist}
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
Group: System Environment/Libraries
URL: http://www.freetype.org
Source: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.ta...
Source1: http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{version...
Source2: http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.ta...
+Source3: ftconfig.h
Patch21: freetype-2.3.0-enable-spr.patch
@@ -139,22 +140,7 @@ rm -rf $RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig.h \
$RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig-%{wordsize}.h
-cat >$RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig.h <<EOF
-#ifndef __FTCONFIG_H__MULTILIB
-#define __FTCONFIG_H__MULTILIB
-
-#include <bits/wordsize.h>
-
-#if __WORDSIZE == 32
-# include "ftconfig-32.h"
-#elif __WORDSIZE == 64
-# include "ftconfig-64.h"
-#else
-# error "unexpected value for __WORDSIZE macro"
-#endif
-
-#endif
-EOF
+install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig.h
# Don't package static a or .la files
rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
@@ -220,6 +206,9 @@ rm -rf $RPM_BUILD_ROOT
%doc docs/tutorial
%changelog
+* Thu May 16 2013 Marek Kasik <mkasik(a)redhat.com> - 2.4.11-4
+- Package ftconfig.h as source file
+
* Tue Mar 19 2013 Marek Kasik <mkasik(a)redhat.com> - 2.4.11-3
- Fix emboldening:
- split out MSB function
diff --git a/ftconfig.h b/ftconfig.h
new file mode 100644
index 0000000..8d4a074
--- /dev/null
+++ b/ftconfig.h
@@ -0,0 +1,14 @@
+#ifndef __FTCONFIG_H__MULTILIB
+#define __FTCONFIG_H__MULTILIB
+
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+# include "ftconfig-32.h"
+#elif __WORDSIZE == 64
+# include "ftconfig-64.h"
+#else
+# error "unexpected value for __WORDSIZE macro"
+#endif
+
+#endif
11 years, 1 month
[freetype] Change encoding of "docs/tutorial/example3.cpp" to UTF-8
by mkasik
commit ed86e4cd55542f9ca9907a03de4e36a125deebc3
Author: Marek Kasik <mkasik(a)redhat.com>
Date: Thu May 16 16:00:54 2013 +0200
Change encoding of "docs/tutorial/example3.cpp" to UTF-8
freetype.spec | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/freetype.spec b/freetype.spec
index c3573fc..bdd7e9f 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -7,7 +7,7 @@
Summary: A free and portable font rendering engine
Name: freetype
Version: 2.4.12
-Release: 3%{?dist}
+Release: 4%{?dist}
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
Group: System Environment/Libraries
URL: http://www.freetype.org
@@ -110,11 +110,15 @@ make TOP_DIR=".."
popd
%endif
-# Convert FTL.txt to UTF-8
+# Convert FTL.txt and example3.cpp to UTF-8
pushd docs
iconv -f latin1 -t utf-8 < FTL.TXT > FTL.TXT.tmp && \
touch -r FTL.TXT FTL.TXT.tmp && \
mv FTL.TXT.tmp FTL.TXT
+
+iconv -f iso-8859-1 -t utf-8 < "tutorial/example3.cpp" > "tutorial/example3.cpp.utf8"
+touch -r tutorial/example3.cpp tutorial/example3.cpp.utf8 && \
+mv tutorial/example3.cpp.utf8 tutorial/example3.cpp
popd
@@ -212,6 +216,9 @@ rm -rf $RPM_BUILD_ROOT
%doc docs/tutorial
%changelog
+* Thu May 16 2013 Marek Kasik <mkasik(a)redhat.com> - 2.4.12-4
+- Change encoding of "docs/tutorial/example3.cpp" to UTF-8
+
* Thu May 16 2013 Marek Kasik <mkasik(a)redhat.com> - 2.4.12-3
- Package ftconfig.h as source file
11 years, 1 month
[freetype] Package ftconfig.h as source file
by mkasik
commit 61fbc4c11d36f6b67bbafdefa8ebe1448e065861
Author: Marek Kasik <mkasik(a)redhat.com>
Date: Thu May 16 16:00:08 2013 +0200
Package ftconfig.h as source file
freetype.spec | 23 ++++++-----------------
ftconfig.h | 14 ++++++++++++++
2 files changed, 20 insertions(+), 17 deletions(-)
---
diff --git a/freetype.spec b/freetype.spec
index 293ab74..c3573fc 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -7,13 +7,14 @@
Summary: A free and portable font rendering engine
Name: freetype
Version: 2.4.12
-Release: 2%{?dist}
+Release: 3%{?dist}
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
Group: System Environment/Libraries
URL: http://www.freetype.org
Source: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.ta...
Source1: http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{version...
Source2: http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.ta...
+Source3: ftconfig.h
Patch21: freetype-2.3.0-enable-spr.patch
@@ -145,22 +146,7 @@ rm -rf $RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig.h \
$RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig-%{wordsize}.h
-cat >$RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig.h <<EOF
-#ifndef __FTCONFIG_H__MULTILIB
-#define __FTCONFIG_H__MULTILIB
-
-#include <bits/wordsize.h>
-
-#if __WORDSIZE == 32
-# include "ftconfig-32.h"
-#elif __WORDSIZE == 64
-# include "ftconfig-64.h"
-#else
-# error "unexpected value for __WORDSIZE macro"
-#endif
-
-#endif
-EOF
+install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig.h
# Don't package static a or .la files
rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
@@ -226,6 +212,9 @@ rm -rf $RPM_BUILD_ROOT
%doc docs/tutorial
%changelog
+* Thu May 16 2013 Marek Kasik <mkasik(a)redhat.com> - 2.4.12-3
+- Package ftconfig.h as source file
+
* Mon May 13 2013 Marek Kasik <mkasik(a)redhat.com> - 2.4.12-2
- Don't use quotes in freetype2.pc
- Resolves: #961855
diff --git a/ftconfig.h b/ftconfig.h
new file mode 100644
index 0000000..8d4a074
--- /dev/null
+++ b/ftconfig.h
@@ -0,0 +1,14 @@
+#ifndef __FTCONFIG_H__MULTILIB
+#define __FTCONFIG_H__MULTILIB
+
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+# include "ftconfig-32.h"
+#elif __WORDSIZE == 64
+# include "ftconfig-64.h"
+#else
+# error "unexpected value for __WORDSIZE macro"
+#endif
+
+#endif
11 years, 1 month
