rpms/freetype-freeworld/F-14 freetype-2.4.2-CVE-2011-0226.patch, NONE, 1.1 freetype-freeworld.spec, 1.13, 1.14
by Kevin Kofler
Author: kkofler
Update of /cvs/free/rpms/freetype-freeworld/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30284/F-14
Modified Files:
freetype-freeworld.spec
Added Files:
freetype-2.4.2-CVE-2011-0226.patch
Log Message:
* Mon Jul 25 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.4.2-6
- Add freetype-2.4.2-CVE-2011-0226.patch from Fedora freetype (rh#723469)
(Add better argument check for `callothersubr'.)
- based on patches by Werner Lemberg,
Alexei Podtelezhnikov and Matthias Drochner
freetype-2.4.2-CVE-2011-0226.patch:
t1decode.c | 34 ++++++++++++++++++++--------------
1 file changed, 20 insertions(+), 14 deletions(-)
--- NEW FILE freetype-2.4.2-CVE-2011-0226.patch ---
--- freetype-2.4.2/src/psaux/t1decode.c 2010-05-11 00:05:58.000000000 +0200
+++ freetype-2.4.2/src/psaux/t1decode.c 2011-07-20 14:54:04.000000000 +0200
@@ -28,6 +28,8 @@
#include "psauxerr.h"
+/* ensure proper sign extension */
+#define Fix2Int( f ) ( (FT_Int)(FT_Short)( (f) >> 16 ) )
/*************************************************************************/
/* */
@@ -671,7 +673,7 @@
if ( large_int )
FT_TRACE4(( " %ld", value ));
else
- FT_TRACE4(( " %ld", (FT_Int32)( value >> 16 ) ));
+ FT_TRACE4(( " %ld", Fix2Int( value ) ));
#endif
*top++ = value;
@@ -693,8 +695,8 @@
top -= 2;
- subr_no = (FT_Int)( top[1] >> 16 );
- arg_cnt = (FT_Int)( top[0] >> 16 );
+ subr_no = Fix2Int( top[1] );
+ arg_cnt = Fix2Int( top[0] );
/***********************************************************/
/* */
@@ -869,7 +871,7 @@
if ( arg_cnt != 1 || blend == NULL )
goto Unexpected_OtherSubr;
- idx = (FT_Int)( top[0] >> 16 );
+ idx = Fix2Int( top[0] );
if ( idx < 0 ||
idx + blend->num_designs > decoder->len_buildchar )
@@ -937,7 +939,7 @@
if ( arg_cnt != 2 || blend == NULL )
goto Unexpected_OtherSubr;
- idx = (FT_Int)( top[1] >> 16 );
+ idx = Fix2Int( top[1] );
if ( idx < 0 || (FT_UInt) idx >= decoder->len_buildchar )
goto Unexpected_OtherSubr;
@@ -958,7 +960,7 @@
if ( arg_cnt != 1 || blend == NULL )
goto Unexpected_OtherSubr;
- idx = (FT_Int)( top[0] >> 16 );
+ idx = Fix2Int( top[0] );
if ( idx < 0 || (FT_UInt) idx >= decoder->len_buildchar )
goto Unexpected_OtherSubr;
@@ -1016,11 +1018,15 @@
break;
default:
- FT_ERROR(( "t1_decoder_parse_charstrings:"
- " unknown othersubr [%d %d], wish me luck\n",
- arg_cnt, subr_no ));
- unknown_othersubr_result_cnt = arg_cnt;
- break;
+ if ( arg_cnt >= 0 && subr_no >= 0 )
+ {
+ FT_ERROR(( "t1_decoder_parse_charstrings:"
+ " unknown othersubr [%d %d], wish me luck\n",
+ arg_cnt, subr_no ));
+ unknown_othersubr_result_cnt = arg_cnt;
+ break;
+ }
+ /* fall through */
Unexpected_OtherSubr:
FT_ERROR(( "t1_decoder_parse_charstrings:"
@@ -1146,8 +1152,8 @@
top[0],
top[1],
top[2],
- (FT_Int)( top[3] >> 16 ),
- (FT_Int)( top[4] >> 16 ) );
+ Fix2Int( top[3] ),
+ Fix2Int( top[4] ) );
case op_sbw:
FT_TRACE4(( " sbw" ));
@@ -1321,7 +1327,7 @@
FT_TRACE4(( " callsubr" ));
- idx = (FT_Int)( top[0] >> 16 );
+ idx = Fix2Int( top[0] );
if ( idx < 0 || idx >= (FT_Int)decoder->num_subrs )
{
FT_ERROR(( "t1_decoder_parse_charstrings:"
Index: freetype-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/freetype-freeworld/F-14/freetype-freeworld.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- freetype-freeworld.spec 8 Mar 2011 22:54:30 -0000 1.13
+++ freetype-freeworld.spec 25 Jul 2011 11:33:08 -0000 1.14
@@ -6,7 +6,7 @@
Summary: A free and portable font rendering engine
Name: freetype-freeworld
Version: 2.4.2
-Release: 5%{?dist}
+Release: 6%{?dist}
License: FTL or GPLv2+
Group: System Environment/Libraries
URL: http://www.freetype.org
@@ -31,6 +31,7 @@
# Security patches
Patch89: freetype-2.4.2-CVE-2010-3311.patch
Patch90: freetype-2.4.2-CVE-2010-3855.patch
+Patch91: freetype-2.4.2-CVE-2011-0226.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@@ -75,6 +76,7 @@
%patch89 -p1 -b .CVE-2010-3311
%patch90 -p1 -b .CVE-2010-3855
+%patch91 -p1 -b .CVE-2011-0226
%build
@@ -119,6 +121,12 @@
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
+* Mon Jul 25 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.4.2-6
+- Add freetype-2.4.2-CVE-2011-0226.patch from Fedora freetype (rh#723469)
+ (Add better argument check for `callothersubr'.)
+ - based on patches by Werner Lemberg,
+ Alexei Podtelezhnikov and Matthias Drochner
+
* Tue Mar 08 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.4.2-5
- Fix autohinting fallback (rh#547532): Ignore CFF-based OTFs.
12 years, 9 months
rpms/freetype-freeworld/devel freetype-freeworld.spec,1.16,1.17
by Kevin Kofler
Author: kkofler
Update of /cvs/free/rpms/freetype-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29723/devel
Modified Files:
freetype-freeworld.spec
Log Message:
Fix file list (GPL.txt now called GPLv2.txt in 2.4.5).
Index: freetype-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/freetype-freeworld/devel/freetype-freeworld.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- freetype-freeworld.spec 25 Jul 2011 11:17:51 -0000 1.16
+++ freetype-freeworld.spec 25 Jul 2011 11:27:44 -0000 1.17
@@ -85,7 +85,7 @@
%files
%defattr(-,root,root)
%{_libdir}/%{name}
-%doc ChangeLog README docs/LICENSE.TXT docs/FTL.TXT docs/GPL.TXT
+%doc ChangeLog README docs/LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
12 years, 9 months
rpms/freetype-freeworld/F-15 freetype-2.4.4-CVE-2011-0226.patch, NONE, 1.1 freetype-freeworld.spec, 1.15, 1.16
by Kevin Kofler
Author: kkofler
Update of /cvs/free/rpms/freetype-freeworld/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29311/F-15
Modified Files:
freetype-freeworld.spec
Added Files:
freetype-2.4.4-CVE-2011-0226.patch
Log Message:
* Mon Jul 25 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.4.4-4
- Add freetype-2.4.4-CVE-2011-0226.patch from Fedora freetype (rh#723469)
(Add better argument check for `callothersubr'.)
- based on patches by Werner Lemberg,
Alexei Podtelezhnikov and Matthias Drochner
freetype-2.4.4-CVE-2011-0226.patch:
t1decode.c | 34 ++++++++++++++++++++--------------
1 file changed, 20 insertions(+), 14 deletions(-)
--- NEW FILE freetype-2.4.4-CVE-2011-0226.patch ---
--- freetype-2.4.4/src/psaux/t1decode.c 2010-11-23 19:28:53.000000000 +0100
+++ freetype-2.4.4/src/psaux/t1decode.c 2011-07-20 14:58:03.000000000 +0200
@@ -28,6 +28,8 @@
#include "psauxerr.h"
+/* ensure proper sign extension */
+#define Fix2Int( f ) ( (FT_Int)(FT_Short)( (f) >> 16 ) )
/*************************************************************************/
/* */
@@ -662,7 +664,7 @@
if ( large_int )
FT_TRACE4(( " %ld", value ));
else
- FT_TRACE4(( " %ld", (FT_Int32)( value >> 16 ) ));
+ FT_TRACE4(( " %ld", Fix2Int( value ) ));
#endif
*top++ = value;
@@ -684,8 +686,8 @@
top -= 2;
- subr_no = (FT_Int)( top[1] >> 16 );
- arg_cnt = (FT_Int)( top[0] >> 16 );
+ subr_no = Fix2Int( top[1] );
+ arg_cnt = Fix2Int( top[0] );
/***********************************************************/
/* */
@@ -862,7 +864,7 @@
if ( arg_cnt != 1 || blend == NULL )
goto Unexpected_OtherSubr;
- idx = (FT_Int)( top[0] >> 16 );
+ idx = Fix2Int( top[0] );
if ( idx < 0 ||
idx + blend->num_designs > decoder->len_buildchar )
@@ -930,7 +932,7 @@
if ( arg_cnt != 2 || blend == NULL )
goto Unexpected_OtherSubr;
- idx = (FT_Int)( top[1] >> 16 );
+ idx = Fix2Int( top[1] );
if ( idx < 0 || (FT_UInt) idx >= decoder->len_buildchar )
goto Unexpected_OtherSubr;
@@ -951,7 +953,7 @@
if ( arg_cnt != 1 || blend == NULL )
goto Unexpected_OtherSubr;
- idx = (FT_Int)( top[0] >> 16 );
+ idx = Fix2Int( top[0] );
if ( idx < 0 || (FT_UInt) idx >= decoder->len_buildchar )
goto Unexpected_OtherSubr;
@@ -1009,11 +1011,15 @@
break;
default:
- FT_ERROR(( "t1_decoder_parse_charstrings:"
- " unknown othersubr [%d %d], wish me luck\n",
- arg_cnt, subr_no ));
- unknown_othersubr_result_cnt = arg_cnt;
- break;
+ if ( arg_cnt >= 0 && subr_no >= 0 )
+ {
+ FT_ERROR(( "t1_decoder_parse_charstrings:"
+ " unknown othersubr [%d %d], wish me luck\n",
+ arg_cnt, subr_no ));
+ unknown_othersubr_result_cnt = arg_cnt;
+ break;
+ }
+ /* fall through */
Unexpected_OtherSubr:
FT_ERROR(( "t1_decoder_parse_charstrings:"
@@ -1139,8 +1145,8 @@
top[0],
top[1],
top[2],
- (FT_Int)( top[3] >> 16 ),
- (FT_Int)( top[4] >> 16 ) );
+ Fix2Int( top[3] ),
+ Fix2Int( top[4] ) );
case op_sbw:
FT_TRACE4(( " sbw" ));
@@ -1324,7 +1330,7 @@
FT_TRACE4(( " callsubr" ));
- idx = (FT_Int)( top[0] >> 16 );
+ idx = Fix2Int( top[0] );
if ( idx < 0 || idx >= (FT_Int)decoder->num_subrs )
{
FT_ERROR(( "t1_decoder_parse_charstrings:"
Index: freetype-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/freetype-freeworld/F-15/freetype-freeworld.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- freetype-freeworld.spec 8 Mar 2011 22:45:11 -0000 1.15
+++ freetype-freeworld.spec 25 Jul 2011 11:25:29 -0000 1.16
@@ -1,7 +1,7 @@
Summary: A free and portable font rendering engine
Name: freetype-freeworld
Version: 2.4.4
-Release: 3%{?dist}
+Release: 4%{?dist}
License: FTL or GPLv2+
Group: System Environment/Libraries
URL: http://www.freetype.org
@@ -12,18 +12,19 @@
# Enable otvalid and gxvalid modules
Patch46: freetype-2.2.1-enable-valid.patch
-# Security patch
+# Security patches
Patch89: freetype-2.4.2-CVE-2010-3311.patch
+Patch90: freetype-2.4.4-CVE-2011-0226.patch
# Backport from upstream git:
# Fall back to autohinting if a TTF/OTF doesn't contain any bytecode.
# Submitted by Kevin Kofler based on a patch from infinality.net, edited and
# committed by Werner Lemberg.
# Should be in the next upstream release.
-Patch90: freetype-2.4.4-auto-autohint.patch
+Patch100: freetype-2.4.4-auto-autohint.patch
# Fix the above autohinting fallback: Ignore CFF-based OTFs.
# Should be in the next upstream release.
-Patch91: freetype-2.4.4-auto-autohint-fix.patch
+Patch101: freetype-2.4.4-auto-autohint-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@@ -53,8 +54,10 @@
%patch46 -p1 -b .enable-valid
%patch89 -p1 -b .CVE-2010-3311
-%patch90 -p1 -b .auto-autohint
-%patch91 -p1 -b .auto-autohint-fix
+%patch90 -p1 -b .CVE-2011-0226
+
+%patch100 -p1 -b .auto-autohint
+%patch101 -p1 -b .auto-autohint-fix
%build
@@ -99,6 +102,12 @@
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
+* Mon Jul 25 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.4.4-4
+- Add freetype-2.4.4-CVE-2011-0226.patch from Fedora freetype (rh#723469)
+ (Add better argument check for `callothersubr'.)
+ - based on patches by Werner Lemberg,
+ Alexei Podtelezhnikov and Matthias Drochner
+
* Tue Mar 08 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.4.4-3
- Fix autohinting fallback (rh#547532): Ignore CFF-based OTFs.
12 years, 9 months
rpms/freetype-freeworld/devel freetype-2.4.5-CVE-2011-0226.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 freetype-freeworld.spec, 1.15, 1.16 sources, 1.9, 1.10 freetype-2.4.4-auto-autohint-fix.patch, 1.1, NONE freetype-2.4.4-auto-autohint.patch, 1.1, NONE
by Kevin Kofler
Author: kkofler
Update of /cvs/free/rpms/freetype-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28480/devel
Modified Files:
.cvsignore freetype-freeworld.spec sources
Added Files:
freetype-2.4.5-CVE-2011-0226.patch
Removed Files:
freetype-2.4.4-auto-autohint-fix.patch
freetype-2.4.4-auto-autohint.patch
Log Message:
* Mon Jul 25 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.4.5-1
- Update to 2.4.5 (matches Fedora freetype)
- Drop upstreamed auto-autohint patches
- Add freetype-2.4.5-CVE-2011-0226.patch from Fedora freetype (rh#723469)
(Add better argument check for `callothersubr'.)
- based on patches by Werner Lemberg,
Alexei Podtelezhnikov and Matthias Drochner
freetype-2.4.5-CVE-2011-0226.patch:
t1decode.c | 34 ++++++++++++++++++++--------------
1 file changed, 20 insertions(+), 14 deletions(-)
--- NEW FILE freetype-2.4.5-CVE-2011-0226.patch ---
--- freetype-2.4.5/src/psaux/t1decode.c 2010-11-23 19:28:53.000000000 +0100
+++ freetype-2.4.5/src/psaux/t1decode.c 2011-07-20 15:00:39.000000000 +0200
@@ -28,6 +28,8 @@
#include "psauxerr.h"
+/* ensure proper sign extension */
+#define Fix2Int( f ) ( (FT_Int)(FT_Short)( (f) >> 16 ) )
/*************************************************************************/
/* */
@@ -662,7 +664,7 @@
if ( large_int )
FT_TRACE4(( " %ld", value ));
else
- FT_TRACE4(( " %ld", (FT_Int32)( value >> 16 ) ));
+ FT_TRACE4(( " %ld", Fix2Int( value ) ));
#endif
*top++ = value;
@@ -684,8 +686,8 @@
top -= 2;
- subr_no = (FT_Int)( top[1] >> 16 );
- arg_cnt = (FT_Int)( top[0] >> 16 );
+ subr_no = Fix2Int( top[1] );
+ arg_cnt = Fix2Int( top[0] );
/***********************************************************/
/* */
@@ -862,7 +864,7 @@
if ( arg_cnt != 1 || blend == NULL )
goto Unexpected_OtherSubr;
- idx = (FT_Int)( top[0] >> 16 );
+ idx = Fix2Int( top[0] );
if ( idx < 0 ||
idx + blend->num_designs > decoder->len_buildchar )
@@ -930,7 +932,7 @@
if ( arg_cnt != 2 || blend == NULL )
goto Unexpected_OtherSubr;
- idx = (FT_Int)( top[1] >> 16 );
+ idx = Fix2Int( top[1] );
if ( idx < 0 || (FT_UInt) idx >= decoder->len_buildchar )
goto Unexpected_OtherSubr;
@@ -951,7 +953,7 @@
if ( arg_cnt != 1 || blend == NULL )
goto Unexpected_OtherSubr;
- idx = (FT_Int)( top[0] >> 16 );
+ idx = Fix2Int( top[0] );
if ( idx < 0 || (FT_UInt) idx >= decoder->len_buildchar )
goto Unexpected_OtherSubr;
@@ -1009,11 +1011,15 @@
break;
default:
- FT_ERROR(( "t1_decoder_parse_charstrings:"
- " unknown othersubr [%d %d], wish me luck\n",
- arg_cnt, subr_no ));
- unknown_othersubr_result_cnt = arg_cnt;
- break;
+ if ( arg_cnt >= 0 && subr_no >= 0 )
+ {
+ FT_ERROR(( "t1_decoder_parse_charstrings:"
+ " unknown othersubr [%d %d], wish me luck\n",
+ arg_cnt, subr_no ));
+ unknown_othersubr_result_cnt = arg_cnt;
+ break;
+ }
+ /* fall through */
Unexpected_OtherSubr:
FT_ERROR(( "t1_decoder_parse_charstrings:"
@@ -1139,8 +1145,8 @@
top[0],
top[1],
top[2],
- (FT_Int)( top[3] >> 16 ),
- (FT_Int)( top[4] >> 16 ) );
+ Fix2Int( top[3] ),
+ Fix2Int( top[4] ) );
case op_sbw:
FT_TRACE4(( " sbw" ));
@@ -1324,7 +1330,7 @@
FT_TRACE4(( " callsubr" ));
- idx = (FT_Int)( top[0] >> 16 );
+ idx = Fix2Int( top[0] );
if ( idx < 0 || idx >= (FT_Int)decoder->num_subrs )
{
FT_ERROR(( "t1_decoder_parse_charstrings:"
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/freetype-freeworld/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 2 Dec 2010 17:21:30 -0000 1.9
+++ .cvsignore 25 Jul 2011 11:17:51 -0000 1.10
@@ -1 +1 @@
-freetype-2.4.4.tar.bz2
+freetype-2.4.5.tar.bz2
Index: freetype-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/freetype-freeworld/devel/freetype-freeworld.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- freetype-freeworld.spec 8 Mar 2011 22:45:11 -0000 1.15
+++ freetype-freeworld.spec 25 Jul 2011 11:17:51 -0000 1.16
@@ -1,7 +1,7 @@
Summary: A free and portable font rendering engine
Name: freetype-freeworld
-Version: 2.4.4
-Release: 3%{?dist}
+Version: 2.4.5
+Release: 1%{?dist}
License: FTL or GPLv2+
Group: System Environment/Libraries
URL: http://www.freetype.org
@@ -12,18 +12,9 @@
# Enable otvalid and gxvalid modules
Patch46: freetype-2.2.1-enable-valid.patch
-# Security patch
+# Security patches
Patch89: freetype-2.4.2-CVE-2010-3311.patch
-
-# Backport from upstream git:
-# Fall back to autohinting if a TTF/OTF doesn't contain any bytecode.
-# Submitted by Kevin Kofler based on a patch from infinality.net, edited and
-# committed by Werner Lemberg.
-# Should be in the next upstream release.
-Patch90: freetype-2.4.4-auto-autohint.patch
-# Fix the above autohinting fallback: Ignore CFF-based OTFs.
-# Should be in the next upstream release.
-Patch91: freetype-2.4.4-auto-autohint-fix.patch
+Patch90: freetype-2.4.5-CVE-2011-0226.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@@ -53,8 +44,7 @@
%patch46 -p1 -b .enable-valid
%patch89 -p1 -b .CVE-2010-3311
-%patch90 -p1 -b .auto-autohint
-%patch91 -p1 -b .auto-autohint-fix
+%patch90 -p1 -b .CVE-2011-0226
%build
@@ -99,6 +89,14 @@
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
+* Mon Jul 25 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.4.5-1
+- Update to 2.4.5 (matches Fedora freetype)
+- Drop upstreamed auto-autohint patches
+- Add freetype-2.4.5-CVE-2011-0226.patch from Fedora freetype (rh#723469)
+ (Add better argument check for `callothersubr'.)
+ - based on patches by Werner Lemberg,
+ Alexei Podtelezhnikov and Matthias Drochner
+
* Tue Mar 08 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.4.4-3
- Fix autohinting fallback (rh#547532): Ignore CFF-based OTFs.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/freetype-freeworld/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 2 Dec 2010 17:21:30 -0000 1.9
+++ sources 25 Jul 2011 11:17:51 -0000 1.10
@@ -1 +1 @@
-b3e2b6e2f1c3e0dffa1fd2a0f848b671 freetype-2.4.4.tar.bz2
+90428a6d8ec4876cd1eb94858c2a59b0 freetype-2.4.5.tar.bz2
--- freetype-2.4.4-auto-autohint-fix.patch DELETED ---
--- freetype-2.4.4-auto-autohint.patch DELETED ---
12 years, 9 months
rpms/kdenlive/F-14 kdenlive.spec,1.6,1.7 sources,1.6,1.7
by Ryan Rix
Author: rrix
Update of /cvs/free/rpms/kdenlive/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1260
Modified Files:
kdenlive.spec sources
Log Message:
* Thu Jul 21 2011 Ryan Rix <ry(a)n.rix.si> 0.8-1
- New version
- Add patch to fix FTBFS
Index: kdenlive.spec
===================================================================
RCS file: /cvs/free/rpms/kdenlive/F-14/kdenlive.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kdenlive.spec 16 Apr 2011 09:45:08 -0000 1.6
+++ kdenlive.spec 24 Jul 2011 22:37:07 -0000 1.7
@@ -1,6 +1,6 @@
Name: kdenlive
-Version: 0.7.8
-Release: 2%{?dist}
+Version: 0.8
+Release: 1%{?dist}
Summary: Non-linear video editor
License: GPLv2+
Group: Applications/Multimedia
@@ -8,13 +8,13 @@
Source: http://downloads.sourceforge.net/kdenlive/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-## upstreamable patches
-Patch100: kdenlive-0.7.8-gcc46.patch
+Patch101: kdenlive-0.8-fix-glu.patch
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: kdelibs4-devel
BuildRequires: mlt-devel
+BuildRequires: qjson-devel
Requires: dvdauthor
Requires: dvgrab
@@ -23,6 +23,7 @@
# if you don't mind missing many niceties -- Rex
Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
Requires: recordmydesktop
+Requires: qjson
%description
Kdenlive is an intuitive and powerful multi-track video editor, including most
@@ -32,7 +33,7 @@
%prep
%setup -q
-%patch100 -p1 -b .gcc46
+%patch101 -p 1
# MLT's binary melt renamed at Fedora, so we must rename it in Kdenlive, too
sed -i 's|/bin/melt|/bin/mlt-melt|' src/mainwindow.cpp
@@ -104,6 +105,10 @@
%changelog
+* Thu Jul 21 2011 Ryan Rix <ry(a)n.rix.si> 0.8-1
+- New version
+- Add patch to fix FTBFS
+
* Fri Apr 15 2011 Rex Dieter <rdieter(a)fedoraproject.org> 0.7.8-2
- update scriptlets, %%_kde4_... macros/best-practices
- +Requires: kdebase-runtime (versioned)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/kdenlive/F-14/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 11 Apr 2011 20:30:30 -0000 1.6
+++ sources 24 Jul 2011 22:37:07 -0000 1.7
@@ -1 +1 @@
-7011d0c6b26f7f2350065defef3d9a76 kdenlive-0.7.8.tar.gz
+26170b4360285e8a7bf53fd122d8854e kdenlive-0.8.tar.gz
12 years, 9 months
rpms/nvidia-kmod/devel sources, 1.33, 1.34 .cvsignore, 1.33, 1.34 nvidia-kmod.spec, 1.79, 1.80
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27318
Modified Files:
sources .cvsignore nvidia-kmod.spec
Log Message:
Update to 280.11
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources 1 Jul 2011 21:47:10 -0000 1.33
+++ sources 24 Jul 2011 21:30:33 -0000 1.34
@@ -1 +1 @@
-8e245de16c8945d9f48ef48833246ce3 nvidia-kmod-data-280.04.tar.bz2
+fa72279a9576dd3301db3e97043094fa nvidia-kmod-data-280.11.tar.bz2
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore 1 Jul 2011 21:47:09 -0000 1.33
+++ .cvsignore 24 Jul 2011 21:30:33 -0000 1.34
@@ -1 +1 @@
-nvidia-kmod-data-280.04.tar.bz2
+nvidia-kmod-data-280.11.tar.bz2
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- nvidia-kmod.spec 1 Jul 2011 21:47:09 -0000 1.79
+++ nvidia-kmod.spec 24 Jul 2011 21:30:33 -0000 1.80
@@ -7,7 +7,7 @@
Name: nvidia-kmod
Epoch: 1
-Version: 280.04
+Version: 280.11
# Taken over by kmodtool
Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
@@ -86,6 +86,9 @@
%changelog
+* Sun Jul 24 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:280.11-1
+- Update to 280.11
+
* Fri Jul 01 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:280.04-1
- Update to 280.04 (beta)
12 years, 9 months
rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec, 1.64, 1.65 sources, 1.33, 1.34 .cvsignore, 1.33, 1.34
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26724
Modified Files:
xorg-x11-drv-nvidia.spec sources .cvsignore
Log Message:
Update to 280.11
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- xorg-x11-drv-nvidia.spec 5 Jul 2011 18:28:41 -0000 1.64
+++ xorg-x11-drv-nvidia.spec 24 Jul 2011 21:24:34 -0000 1.65
@@ -6,8 +6,8 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 280.04
-Release: 2%{?dist}
+Version: 280.11
+Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -344,6 +344,9 @@
%changelog
+* Sun Jul 24 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:280.11-1
+- Update to 280.11
+
* Tue Jul 05 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:280.04-2
- Fix filter_from_requires/provides libglx.so
- Fix filter_from_requires/provides libcuda.so.1
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources 1 Jul 2011 21:47:42 -0000 1.33
+++ sources 24 Jul 2011 21:24:34 -0000 1.34
@@ -1,2 +1,2 @@
-15f030a5af37073eb7cf58ae6e08e7a9 NVIDIA-Linux-x86-280.04.run
-b27e2f82877fcbd8c84a2c6f6141266f NVIDIA-Linux-x86_64-280.04.run
+9149aa57d5522ccddd6e816eb1f08b15 NVIDIA-Linux-x86_64-280.11.run
+9902f8f920ef9e1abef0d1de981da169 NVIDIA-Linux-x86-280.11.run
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore 1 Jul 2011 21:47:42 -0000 1.33
+++ .cvsignore 24 Jul 2011 21:24:34 -0000 1.34
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-280.04.run
-NVIDIA-Linux-x86_64-280.04.run
+NVIDIA-Linux-x86_64-280.11.run
+NVIDIA-Linux-x86-280.11.run
12 years, 9 months
rpms/kdenlive/F-15 kdenlive.spec,1.6,1.7 sources,1.6,1.7
by Ryan Rix
Author: rrix
Update of /cvs/free/rpms/kdenlive/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20719
Modified Files:
kdenlive.spec sources
Log Message:
* Thu Jul 21 2011 Ryan Rix <ry(a)n.rix.si> 0.8-1
- New version
- Add patch to fix FTBFS
Index: kdenlive.spec
===================================================================
RCS file: /cvs/free/rpms/kdenlive/F-15/kdenlive.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kdenlive.spec 16 Apr 2011 09:09:17 -0000 1.6
+++ kdenlive.spec 24 Jul 2011 02:32:05 -0000 1.7
@@ -1,6 +1,6 @@
Name: kdenlive
-Version: 0.7.8
-Release: 2%{?dist}
+Version: 0.8
+Release: 1%{?dist}
Summary: Non-linear video editor
License: GPLv2+
Group: Applications/Multimedia
@@ -8,13 +8,13 @@
Source: http://downloads.sourceforge.net/kdenlive/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-## upstreamable patches
-Patch100: kdenlive-0.7.8-gcc46.patch
+Patch101: kdenlive-0.8-fix-glu.patch
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: kdelibs4-devel
BuildRequires: mlt-devel
+BuildRequires: qjson-devel
Requires: dvdauthor
Requires: dvgrab
@@ -23,6 +23,7 @@
# if you don't mind missing many niceties -- Rex
Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
Requires: recordmydesktop
+Requires: qjson
%description
Kdenlive is an intuitive and powerful multi-track video editor, including most
@@ -32,7 +33,7 @@
%prep
%setup -q
-%patch100 -p1 -b .gcc46
+%patch101 -p 1
# MLT's binary melt renamed at Fedora, so we must rename it in Kdenlive, too
sed -i 's|/bin/melt|/bin/mlt-melt|' src/mainwindow.cpp
@@ -104,6 +105,10 @@
%changelog
+* Thu Jul 21 2011 Ryan Rix <ry(a)n.rix.si> 0.8-1
+- New version
+- Add patch to fix FTBFS
+
* Fri Apr 15 2011 Rex Dieter <rdieter(a)fedoraproject.org> 0.7.8-2
- update scriptlets, %%_kde4_... macros/best-practices
- +Requires: kdebase-runtime (versioned)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/kdenlive/F-15/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 11 Apr 2011 20:29:06 -0000 1.6
+++ sources 24 Jul 2011 02:32:05 -0000 1.7
@@ -1 +1 @@
-7011d0c6b26f7f2350065defef3d9a76 kdenlive-0.7.8.tar.gz
+26170b4360285e8a7bf53fd122d8854e kdenlive-0.8.tar.gz
12 years, 9 months
rpms/kdenlive/devel kdenlive.spec,1.7,1.8
by Ryan Rix
Author: rrix
Update of /cvs/free/rpms/kdenlive/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24664
Modified Files:
kdenlive.spec
Log Message:
Add QJson deps
Index: kdenlive.spec
===================================================================
RCS file: /cvs/free/rpms/kdenlive/devel/kdenlive.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kdenlive.spec 22 Jul 2011 01:27:23 -0000 1.7
+++ kdenlive.spec 24 Jul 2011 00:20:22 -0000 1.8
@@ -14,6 +14,7 @@
BuildRequires: gettext
BuildRequires: kdelibs4-devel
BuildRequires: mlt-devel
+BuildRequires: qjson-devel
Requires: dvdauthor
Requires: dvgrab
@@ -22,6 +23,7 @@
# if you don't mind missing many niceties -- Rex
Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
Requires: recordmydesktop
+Requires: qjson
%description
Kdenlive is an intuitive and powerful multi-track video editor, including most
12 years, 9 months
rpms/smc/devel smc.spec,1.15,1.16
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/smc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30151
Modified Files:
smc.spec
Log Message:
* Sat Jul 23 2011 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.9-8
- rebuild for new libboost
Index: smc.spec
===================================================================
RCS file: /cvs/free/rpms/smc/devel/smc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- smc.spec 10 Feb 2011 20:45:10 -0000 1.15
+++ smc.spec 23 Jul 2011 19:28:54 -0000 1.16
@@ -1,6 +1,6 @@
Name: smc
Version: 1.9
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: 2D platform game that uses OpenGL in a style similar to Super Mario
Group: Amusements/Games
License: GPLv3
@@ -14,7 +14,6 @@
Patch1: smc-fixes-for-cegui-v0-7.diff
# submitted upstream
Patch2: smc-1.9-boost-filesystem-v3.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libX11-devel
BuildRequires: gettext-devel
BuildRequires: boost-devel >= 1.46
@@ -76,7 +75,6 @@
%install
-rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
install -pm0644 data/icon/window_32.png \
@@ -89,23 +87,18 @@
%{name}.desktop
-%clean
-rm -rf %{buildroot}
-
-
%post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
%files
%defattr(-,root,root,-)
@@ -118,6 +111,9 @@
%changelog
+* Sat Jul 23 2011 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.9-8
+- rebuild for new libboost
+
* Thu Feb 10 2011 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 1.9-7
- rebuild for new libboost
12 years, 9 months