rpms/thunderbird-enigmail/F-15 crashreporter-remove-static.patch, NONE, 1.1 enigmail-rdf.patch, NONE, 1.1 mozilla-build-s390.patch, NONE, 1.1 sources, 1.9, 1.10 thunderbird-enigmail.spec, 1.9, 1.10 thunderbird-mozconfig, 1.4, 1.5 enigmail-1.1.2-perm.patch, 1.1, NONE mozilla-jemalloc.patch, 1.1, NONE remove-static.patch, 1.1, NONE thunderbird-shared-error.patch, 1.4, NONE xulrunner-1.9.2.1-build.patch, 1.1, NONE xulrunner-missing-headers.patch, 1.1, NONE
by Remi Collet
Author: remi
Update of /cvs/free/rpms/thunderbird-enigmail/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19970
Modified Files:
sources thunderbird-enigmail.spec thunderbird-mozconfig
Added Files:
crashreporter-remove-static.patch enigmail-rdf.patch
mozilla-build-s390.patch
Removed Files:
enigmail-1.1.2-perm.patch mozilla-jemalloc.patch
remove-static.patch thunderbird-shared-error.patch
xulrunner-1.9.2.1-build.patch xulrunner-missing-headers.patch
Log Message:
Enigmail 1.2 for Thunderbird 5.0
crashreporter-remove-static.patch:
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE crashreporter-remove-static.patch ---
Remove static build option from crashreporter to remove dependency on static libraries
diff -up comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
--- comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static 2010-06-23 19:47:11.000000000 +0200
+++ comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in 2010-07-12 15:51:41.000000000 +0200
@@ -64,6 +64,6 @@ FORCE_USE_PIC = 1
#XXX: bug 554854 causes us to be unable to run binaries on the build slaves
# due to them having an older libstdc++
-HOST_LDFLAGS += -static
+#HOST_LDFLAGS += -static
include $(topsrcdir)/config/rules.mk
enigmail-rdf.patch:
install.rdf | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
--- NEW FILE enigmail-rdf.patch ---
--- enigmail/package/install.rdf.orig 2011-07-17 20:18:23.000000000 +0200
+++ enigmail/package/install.rdf 2011-07-17 20:18:32.000000000 +0200
@@ -5,7 +5,7 @@
<Description about="urn:mozilla:install-manifest">
<em:id>{847b3a00-7ab1-11d4-8f02-006008948af5}</em:id>
- <em:version>1.2pre</em:version>
+ <em:version>1.2</em:version>
<em:type>2</em:type> <!-- type = extension -->
<em:unpack>true</em:unpack>
@@ -27,14 +27,6 @@
<em:maxVersion>2.1.*</em:maxVersion>
</Description>
</em:targetApplication>
- <!-- em:targetApplication>
- < ! -- Spicebird -- >
- <Description>
- <em:id>{ee53ece0-255c-4cc6-8a7e-81a8b6e5ba2c}</em:id>
- <em:minVersion>0.7</em:minVersion>
- <em:maxVersion>0.8</em:maxVersion>
- </Description>
- </em:targetApplication -->
<!-- targetPlatform placeholder -->
mozilla-build-s390.patch:
jstl.h | 1 -
1 file changed, 1 deletion(-)
--- NEW FILE mozilla-build-s390.patch ---
diff -up mozilla-1.9.2/js/src/jstl.h.s390 mozilla-1.9.2/js/src/jstl.h
--- mozilla-1.9.2/js/src/jstl.h.s390 2011-02-18 19:33:24.000000000 +0100
+++ mozilla-1.9.2/js/src/jstl.h 2011-03-07 08:41:29.000000000 +0100
@@ -195,7 +195,6 @@ class ReentrancyGuard
JS_ALWAYS_INLINE size_t
RoundUpPow2(size_t x)
{
- typedef tl::StaticAssert<tl::IsSameType<size_t,JSUword>::result>::result _;
size_t log2 = JS_CEILING_LOG2W(x);
JS_ASSERT(log2 < tl::BitSize<size_t>::result);
size_t result = size_t(1) << log2;
Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-15/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 22 Jul 2010 07:08:48 -0000 1.9
+++ sources 17 Jul 2011 21:19:16 -0000 1.10
@@ -1,2 +1,2 @@
-3a8479252bb9a0c534870896fc10e2ff thunderbird-3.1.1.source.tar.bz2
-7d329d5e8afbbb28214ca1995beb09c9 enigmail-1.1.2.tar.gz
+0bbacea54b4b8fc4ff20e73b3278c1ba thunderbird-5.0.source.tar.bz2
+f8ba15164adc1c0e8328582146461aec enigmail-1.2.tar.gz
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-15/thunderbird-enigmail.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- thunderbird-enigmail.spec 22 Jul 2010 07:08:48 -0000 1.9
+++ thunderbird-enigmail.spec 17 Jul 2011 21:19:16 -0000 1.10
@@ -1,12 +1,13 @@
-%global nspr_version 4.8
-%global nss_version 3.12.3.99
-%global cairo_version 1.8.8
-%global freetype_version 2.1.9
-%global sqlite_version 3.6.22
-%global libnotify_version 0.4
-%global moz_objdir objdir-tb
+%define nspr_version 4.8
+%define nss_version 3.12.8
+%define cairo_version 1.8.8
+%define freetype_version 2.1.9
+%define sqlite_version 3.6.14
+%define libnotify_version 0.4
+%define build_langpacks 1
+%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
-%global thunver 3.1.1
+%global thunver 5.0
# The tarball is pretty inconsistent with directory structure.
# Sometimes there is a top level directory. That goes here.
@@ -14,22 +15,22 @@
# IMPORTANT: If there is no top level directory, this should be
# set to the cwd, ie: '.'
#%define tarballdir .
-%global tarballdir comm-1.9.2
+%define tarballdir comm-miramar
-%global official_branding 1
+%define official_branding 1
-%global version_internal 3.1
-%global mozappdir %{_libdir}/thunderbird-%{version_internal}
+%define version_internal 5.0
+%define mozappdir %{_libdir}/thunderbird-%{version_internal}
%global enigmail_extname %{_libdir}/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}/{847b3a00-7ab1-11d4-8f02-006008948af5}
Summary: Authentication and encryption extension for Mozilla Thunderbird
Name: thunderbird-enigmail
-Version: 1.1.2
+Version: 1.2
%if 0%{?prever:1}
Release: 0.1.%{prever}%{?dist}
%else
-Release: 1%{?dist}
+Release: 1%{?dist}.1
%endif
URL: http://enigmail.mozdev.org/
License: MPLv1.1 or GPLv2+
@@ -51,22 +52,16 @@
%endif
# http://www.mozdev.org/pipermail/enigmail/2009-April/011018.html
-Source101: enigmail-fixlang.php
+Source101: enigmail-fixlang.php
+
-# Fix for version issues
Patch0: thunderbird-version.patch
-# Fix for jemalloc
-Patch1: mozilla-jemalloc.patch
-# Fix for installation fail when building with dynamic linked libraries
-Patch2: thunderbird-shared-error.patch
-# Fixes gcc complain that nsFrame::delete is protected
-Patch4: xulrunner-1.9.2.1-build.patch
-# Fix missing includes for crash reporter, remove in 3.1 final
-Patch5: xulrunner-missing-headers.patch
-Patch6: remove-static.patch
+Patch6: mozilla-build-s390.patch
+Patch7: crashreporter-remove-static.patch
# Enigmail patch
-Patch101: enigmail-1.1.2-perm.patch
+Patch100: enigmail-rdf.patch
+
%if %{official_branding}
# Required by Mozilla Corporation
@@ -102,20 +97,21 @@
BuildRequires: alsa-lib-devel
BuildRequires: autoconf213
BuildRequires: desktop-file-utils
+BuildRequires: libcurl-devel
+BuildRequires: yasm
+BuildRequires: mesa-libGL-devel
BuildRequires: GConf2-devel
-
## For fixing lang
-%if 0%{?CVS}
BuildRequires: dos2unix, php-cli
-%endif
+
# Without this enigmmail will require libxpcom.so and other .so
# which are not provided by thunderbird (to avoid mistake,
# because provided by xulrunner).
AutoReq: 0
# All others deps already required by thunderbird
-Requires: gnupg, thunderbird >= %{version_internal}
+Requires: gnupg, thunderbird >= %{thunver}
# Nothing usefull provided
AutoProv: 0
@@ -136,11 +132,13 @@
> version.patch
%{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch
-%patch1 -p0 -b .jemalloc
-%patch2 -p1 -b .shared-error
-%patch4 -p1 -b .protected
-%patch5 -p0 -b .stat
-%patch6 -p1 -b .static
+# Mozilla (XULRunner) patches
+cd mozilla
+%ifarch s390
+%patch6 -p1 -b .s390
+%endif
+%patch7 -p2 -b .static
+cd ..
%if %{official_branding}
# Required by Mozilla Corporation
@@ -158,11 +156,19 @@
%endif
# ===== Enigmail work =====
-# ===== Fixing langpack
%if 0%{?CVS}
mkdir mailnews/extensions/enigmail
tar xzf %{SOURCE100} -C mailnews/extensions/enigmail
+%else
+tar xzf %{SOURCE100} -C mailnews/extensions
+pushd mailnews/extensions/enigmail
+# Apply Enigmail patch here
+%patch100 -p1 -b .orig
+popd
+%endif
+
+# ===== Fixing langpack
pushd mailnews/extensions/enigmail
for rep in $(cat lang/current-languages.txt)
do
@@ -171,12 +177,6 @@
php %{SOURCE101} ui/locale/en-US lang/$rep
done
popd
-%else
-tar xzf %{SOURCE100} -C mailnews/extensions
-pushd mailnews/extensions/enigmail
-%patch101 -p1
-popd
-%endif
#===============================================================================
@@ -186,11 +186,18 @@
INTERNAL_GECKO=%{version_internal}
MOZ_APP_DIR=%{mozappdir}
-# Build with -Os as it helps the browser; also, don't override mozilla's warning
-# level; they use -Wall but disable a few warnings that show up _everywhere_
-MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-O2/-Os/' -e 's/-Wall//')
+# -fpermissive is needed to build with gcc 4.6+ which has become stricter
+#
+# Mozilla builds with -Wall with exception of a few warnings which show up
+# everywhere in the code; so, don't override that.
+#
+# Disable C++ exceptions since Mozilla code is not exception-safe
+#
+MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \
+ %{__sed} -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g')
+export CFLAGS=$MOZ_OPT_FLAGS
+export CXXFLAGS=$MOZ_OPT_FLAGS
-export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
export PREFIX='%{_prefix}'
export LIBDIR='%{_libdir}'
@@ -204,25 +211,21 @@
export LDFLAGS="-Wl,-rpath,%{mozappdir}"
export MAKE="gmake %{moz_make_flags}"
-# ===== Minimal build =====
-make -f client.mk export
-pushd %{moz_objdir}/mozilla/modules/libreg
-make
-cd ../../xpcom/string
-make
-cd ..
-make
-cd obsolete
-make
-popd
+# ===== Thunderbird build =====
+# http://enigmail.mozdev.org/download/source.php.html
+make -f client.mk build
# ===== Enigmail work =====
pushd mailnews/extensions/enigmail
./makemake -r
+make
popd
-pushd %{moz_objdir}/mailnews/extensions/enigmail
-make
+pushd mozilla/dist/bin/chrome/enigmail
+zip ../enigmail.jar -r content locale skin
+popd
+
+pushd mailnews/extensions/enigmail
make xpi
popd
@@ -235,7 +238,7 @@
%{__mkdir_p} $RPM_BUILD_ROOT%{enigmail_extname}
-%{__unzip} -q %{moz_objdir}/mozilla/dist/bin/enigmail-*-linux-*.xpi -d $RPM_BUILD_ROOT%{enigmail_extname}
+%{__unzip} -q mozilla/dist/bin/enigmail-*-linux-*.xpi -d $RPM_BUILD_ROOT%{enigmail_extname}
%{__chmod} +x $RPM_BUILD_ROOT%{enigmail_extname}/wrappers/*.sh
@@ -251,6 +254,12 @@
#===============================================================================
%changelog
+* Sun Jul 17 2011 Remi Collet <remi(a)fedoraproject.org> 1.2-1.1
+- fix BR (dos2unix + php-cli)
+
+* Sun Jul 17 2011 Remi Collet <remi(a)fedoraproject.org> 1.2-1
+- Enigmail 1.2 for Thunderbird 5.0
+
* Thu Jul 22 2010 Remi Collet <rpms(a)famillecollet.com> 1.1.2-1
- Enigmail 1.1.2 (against thunderbird 3.1.1)
- move to /usr/lib/mozilla/extensions (as lightning)
Index: thunderbird-mozconfig
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-15/thunderbird-mozconfig,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- thunderbird-mozconfig 26 Jun 2010 08:09:53 -0000 1.4
+++ thunderbird-mozconfig 17 Jul 2011 21:19:16 -0000 1.5
@@ -1,6 +1,6 @@
mk_add_options MOZ_CO_PROJECT=mail
ac_add_options --enable-application=mail
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir-tb/
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@
mk_add_options AUTOCONF=autoconf-2.13
#ac_add_options --with-system-png
@@ -15,7 +15,7 @@
ac_add_options --disable-tests
ac_add_options --disable-debug
ac_add_options --disable-installer
-ac_add_options --enable-optimize="$RPM_OPT_FLAGS"
+ac_add_options --enable-optimize
ac_add_options --enable-xinerama
ac_add_options --enable-default-toolkit=cairo-gtk2
ac_add_options --disable-xprint
@@ -28,6 +28,9 @@
ac_add_options --enable-system-hunspell
ac_add_options --disable-crashreporter
ac_add_options --disable-necko-wifi
+ac_add_options --disable-updater
+#ac_add_options --enable-static
+ac_add_options --enable-startup-notification
export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1
--- enigmail-1.1.2-perm.patch DELETED ---
--- mozilla-jemalloc.patch DELETED ---
--- remove-static.patch DELETED ---
--- thunderbird-shared-error.patch DELETED ---
--- xulrunner-1.9.2.1-build.patch DELETED ---
--- xulrunner-missing-headers.patch DELETED ---
12 years, 10 months
rpms/thunderbird-enigmail/devel thunderbird-enigmail.spec, 1.10, 1.11
by Remi Collet
Author: remi
Update of /cvs/free/rpms/thunderbird-enigmail/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18272
Modified Files:
thunderbird-enigmail.spec
Log Message:
fix BR
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-enigmail.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- thunderbird-enigmail.spec 17 Jul 2011 20:43:47 -0000 1.10
+++ thunderbird-enigmail.spec 17 Jul 2011 21:05:33 -0000 1.11
@@ -30,7 +30,7 @@
%if 0%{?prever:1}
Release: 0.1.%{prever}%{?dist}
%else
-Release: 1%{?dist}
+Release: 1%{?dist}.1
%endif
URL: http://enigmail.mozdev.org/
License: MPLv1.1 or GPLv2+
@@ -102,11 +102,9 @@
BuildRequires: mesa-libGL-devel
BuildRequires: GConf2-devel
-
## For fixing lang
-%if 0%{?CVS}
BuildRequires: dos2unix, php-cli
-%endif
+
# Without this enigmmail will require libxpcom.so and other .so
# which are not provided by thunderbird (to avoid mistake,
@@ -256,6 +254,9 @@
#===============================================================================
%changelog
+* Sun Jul 17 2011 Remi Collet <remi(a)fedoraproject.org> 1.2-1.1
+- fix BR (dos2unix + php-cli)
+
* Sun Jul 17 2011 Remi Collet <remi(a)fedoraproject.org> 1.2-1
- Enigmail 1.2 for Thunderbird 5.0
12 years, 10 months
rpms/thunderbird-enigmail/devel crashreporter-remove-static.patch, NONE, 1.1 enigmail-rdf.patch, NONE, 1.1 mozilla-build-s390.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.9, 1.10 thunderbird-enigmail.spec, 1.9, 1.10 thunderbird-mozconfig, 1.4, 1.5 enigmail-1.1.2-perm.patch, 1.1, NONE mozilla-jemalloc.patch, 1.1, NONE remove-static.patch, 1.1, NONE thunderbird-shared-error.patch, 1.4, NONE xulrunner-1.9.2.1-build.patch, 1.1, NONE xulrunner-missing-headers.patch, 1.1, NONE
by Remi Collet
Author: remi
Update of /cvs/free/rpms/thunderbird-enigmail/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16268
Modified Files:
.cvsignore sources thunderbird-enigmail.spec
thunderbird-mozconfig
Added Files:
crashreporter-remove-static.patch enigmail-rdf.patch
mozilla-build-s390.patch
Removed Files:
enigmail-1.1.2-perm.patch mozilla-jemalloc.patch
remove-static.patch thunderbird-shared-error.patch
xulrunner-1.9.2.1-build.patch xulrunner-missing-headers.patch
Log Message:
Update to Enigmail 1.2 for Thunderbird 5.0
crashreporter-remove-static.patch:
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE crashreporter-remove-static.patch ---
Remove static build option from crashreporter to remove dependency on static libraries
diff -up comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
--- comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static 2010-06-23 19:47:11.000000000 +0200
+++ comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in 2010-07-12 15:51:41.000000000 +0200
@@ -64,6 +64,6 @@ FORCE_USE_PIC = 1
#XXX: bug 554854 causes us to be unable to run binaries on the build slaves
# due to them having an older libstdc++
-HOST_LDFLAGS += -static
+#HOST_LDFLAGS += -static
include $(topsrcdir)/config/rules.mk
enigmail-rdf.patch:
install.rdf | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
--- NEW FILE enigmail-rdf.patch ---
--- enigmail/package/install.rdf.orig 2011-07-17 20:18:23.000000000 +0200
+++ enigmail/package/install.rdf 2011-07-17 20:18:32.000000000 +0200
@@ -5,7 +5,7 @@
<Description about="urn:mozilla:install-manifest">
<em:id>{847b3a00-7ab1-11d4-8f02-006008948af5}</em:id>
- <em:version>1.2pre</em:version>
+ <em:version>1.2</em:version>
<em:type>2</em:type> <!-- type = extension -->
<em:unpack>true</em:unpack>
@@ -27,14 +27,6 @@
<em:maxVersion>2.1.*</em:maxVersion>
</Description>
</em:targetApplication>
- <!-- em:targetApplication>
- < ! -- Spicebird -- >
- <Description>
- <em:id>{ee53ece0-255c-4cc6-8a7e-81a8b6e5ba2c}</em:id>
- <em:minVersion>0.7</em:minVersion>
- <em:maxVersion>0.8</em:maxVersion>
- </Description>
- </em:targetApplication -->
<!-- targetPlatform placeholder -->
mozilla-build-s390.patch:
jstl.h | 1 -
1 file changed, 1 deletion(-)
--- NEW FILE mozilla-build-s390.patch ---
diff -up mozilla-1.9.2/js/src/jstl.h.s390 mozilla-1.9.2/js/src/jstl.h
--- mozilla-1.9.2/js/src/jstl.h.s390 2011-02-18 19:33:24.000000000 +0100
+++ mozilla-1.9.2/js/src/jstl.h 2011-03-07 08:41:29.000000000 +0100
@@ -195,7 +195,6 @@ class ReentrancyGuard
JS_ALWAYS_INLINE size_t
RoundUpPow2(size_t x)
{
- typedef tl::StaticAssert<tl::IsSameType<size_t,JSUword>::result>::result _;
size_t log2 = JS_CEILING_LOG2W(x);
JS_ASSERT(log2 < tl::BitSize<size_t>::result);
size_t result = size_t(1) << log2;
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 22 Jul 2010 07:08:48 -0000 1.8
+++ .cvsignore 17 Jul 2011 20:43:46 -0000 1.9
@@ -1,2 +1,2 @@
-thunderbird-3.1.1.source.tar.bz2
-enigmail-1.1.2.tar.gz
+thunderbird-5.0.source.tar.bz2
+enigmail-1.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 22 Jul 2010 07:08:48 -0000 1.9
+++ sources 17 Jul 2011 20:43:47 -0000 1.10
@@ -1,2 +1,2 @@
-3a8479252bb9a0c534870896fc10e2ff thunderbird-3.1.1.source.tar.bz2
-7d329d5e8afbbb28214ca1995beb09c9 enigmail-1.1.2.tar.gz
+0bbacea54b4b8fc4ff20e73b3278c1ba thunderbird-5.0.source.tar.bz2
+f8ba15164adc1c0e8328582146461aec enigmail-1.2.tar.gz
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-enigmail.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- thunderbird-enigmail.spec 22 Jul 2010 07:08:48 -0000 1.9
+++ thunderbird-enigmail.spec 17 Jul 2011 20:43:47 -0000 1.10
@@ -1,12 +1,13 @@
-%global nspr_version 4.8
-%global nss_version 3.12.3.99
-%global cairo_version 1.8.8
-%global freetype_version 2.1.9
-%global sqlite_version 3.6.22
-%global libnotify_version 0.4
-%global moz_objdir objdir-tb
+%define nspr_version 4.8
+%define nss_version 3.12.8
+%define cairo_version 1.8.8
+%define freetype_version 2.1.9
+%define sqlite_version 3.6.14
+%define libnotify_version 0.4
+%define build_langpacks 1
+%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
-%global thunver 3.1.1
+%global thunver 5.0
# The tarball is pretty inconsistent with directory structure.
# Sometimes there is a top level directory. That goes here.
@@ -14,18 +15,18 @@
# IMPORTANT: If there is no top level directory, this should be
# set to the cwd, ie: '.'
#%define tarballdir .
-%global tarballdir comm-1.9.2
+%define tarballdir comm-miramar
-%global official_branding 1
+%define official_branding 1
-%global version_internal 3.1
-%global mozappdir %{_libdir}/thunderbird-%{version_internal}
+%define version_internal 5.0
+%define mozappdir %{_libdir}/thunderbird-%{version_internal}
%global enigmail_extname %{_libdir}/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}/{847b3a00-7ab1-11d4-8f02-006008948af5}
Summary: Authentication and encryption extension for Mozilla Thunderbird
Name: thunderbird-enigmail
-Version: 1.1.2
+Version: 1.2
%if 0%{?prever:1}
Release: 0.1.%{prever}%{?dist}
%else
@@ -51,22 +52,16 @@
%endif
# http://www.mozdev.org/pipermail/enigmail/2009-April/011018.html
-Source101: enigmail-fixlang.php
+Source101: enigmail-fixlang.php
+
-# Fix for version issues
Patch0: thunderbird-version.patch
-# Fix for jemalloc
-Patch1: mozilla-jemalloc.patch
-# Fix for installation fail when building with dynamic linked libraries
-Patch2: thunderbird-shared-error.patch
-# Fixes gcc complain that nsFrame::delete is protected
-Patch4: xulrunner-1.9.2.1-build.patch
-# Fix missing includes for crash reporter, remove in 3.1 final
-Patch5: xulrunner-missing-headers.patch
-Patch6: remove-static.patch
+Patch6: mozilla-build-s390.patch
+Patch7: crashreporter-remove-static.patch
# Enigmail patch
-Patch101: enigmail-1.1.2-perm.patch
+Patch100: enigmail-rdf.patch
+
%if %{official_branding}
# Required by Mozilla Corporation
@@ -102,6 +97,9 @@
BuildRequires: alsa-lib-devel
BuildRequires: autoconf213
BuildRequires: desktop-file-utils
+BuildRequires: libcurl-devel
+BuildRequires: yasm
+BuildRequires: mesa-libGL-devel
BuildRequires: GConf2-devel
@@ -115,7 +113,7 @@
# because provided by xulrunner).
AutoReq: 0
# All others deps already required by thunderbird
-Requires: gnupg, thunderbird >= %{version_internal}
+Requires: gnupg, thunderbird >= %{thunver}
# Nothing usefull provided
AutoProv: 0
@@ -136,11 +134,13 @@
> version.patch
%{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch
-%patch1 -p0 -b .jemalloc
-%patch2 -p1 -b .shared-error
-%patch4 -p1 -b .protected
-%patch5 -p0 -b .stat
-%patch6 -p1 -b .static
+# Mozilla (XULRunner) patches
+cd mozilla
+%ifarch s390
+%patch6 -p1 -b .s390
+%endif
+%patch7 -p2 -b .static
+cd ..
%if %{official_branding}
# Required by Mozilla Corporation
@@ -158,11 +158,19 @@
%endif
# ===== Enigmail work =====
-# ===== Fixing langpack
%if 0%{?CVS}
mkdir mailnews/extensions/enigmail
tar xzf %{SOURCE100} -C mailnews/extensions/enigmail
+%else
+tar xzf %{SOURCE100} -C mailnews/extensions
+pushd mailnews/extensions/enigmail
+# Apply Enigmail patch here
+%patch100 -p1 -b .orig
+popd
+%endif
+
+# ===== Fixing langpack
pushd mailnews/extensions/enigmail
for rep in $(cat lang/current-languages.txt)
do
@@ -171,12 +179,6 @@
php %{SOURCE101} ui/locale/en-US lang/$rep
done
popd
-%else
-tar xzf %{SOURCE100} -C mailnews/extensions
-pushd mailnews/extensions/enigmail
-%patch101 -p1
-popd
-%endif
#===============================================================================
@@ -186,11 +188,18 @@
INTERNAL_GECKO=%{version_internal}
MOZ_APP_DIR=%{mozappdir}
-# Build with -Os as it helps the browser; also, don't override mozilla's warning
-# level; they use -Wall but disable a few warnings that show up _everywhere_
-MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-O2/-Os/' -e 's/-Wall//')
+# -fpermissive is needed to build with gcc 4.6+ which has become stricter
+#
+# Mozilla builds with -Wall with exception of a few warnings which show up
+# everywhere in the code; so, don't override that.
+#
+# Disable C++ exceptions since Mozilla code is not exception-safe
+#
+MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \
+ %{__sed} -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g')
+export CFLAGS=$MOZ_OPT_FLAGS
+export CXXFLAGS=$MOZ_OPT_FLAGS
-export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
export PREFIX='%{_prefix}'
export LIBDIR='%{_libdir}'
@@ -204,25 +213,21 @@
export LDFLAGS="-Wl,-rpath,%{mozappdir}"
export MAKE="gmake %{moz_make_flags}"
-# ===== Minimal build =====
-make -f client.mk export
-pushd %{moz_objdir}/mozilla/modules/libreg
-make
-cd ../../xpcom/string
-make
-cd ..
-make
-cd obsolete
-make
-popd
+# ===== Thunderbird build =====
+# http://enigmail.mozdev.org/download/source.php.html
+make -f client.mk build
# ===== Enigmail work =====
pushd mailnews/extensions/enigmail
./makemake -r
+make
popd
-pushd %{moz_objdir}/mailnews/extensions/enigmail
-make
+pushd mozilla/dist/bin/chrome/enigmail
+zip ../enigmail.jar -r content locale skin
+popd
+
+pushd mailnews/extensions/enigmail
make xpi
popd
@@ -235,7 +240,7 @@
%{__mkdir_p} $RPM_BUILD_ROOT%{enigmail_extname}
-%{__unzip} -q %{moz_objdir}/mozilla/dist/bin/enigmail-*-linux-*.xpi -d $RPM_BUILD_ROOT%{enigmail_extname}
+%{__unzip} -q mozilla/dist/bin/enigmail-*-linux-*.xpi -d $RPM_BUILD_ROOT%{enigmail_extname}
%{__chmod} +x $RPM_BUILD_ROOT%{enigmail_extname}/wrappers/*.sh
@@ -251,6 +256,9 @@
#===============================================================================
%changelog
+* Sun Jul 17 2011 Remi Collet <remi(a)fedoraproject.org> 1.2-1
+- Enigmail 1.2 for Thunderbird 5.0
+
* Thu Jul 22 2010 Remi Collet <rpms(a)famillecollet.com> 1.1.2-1
- Enigmail 1.1.2 (against thunderbird 3.1.1)
- move to /usr/lib/mozilla/extensions (as lightning)
Index: thunderbird-mozconfig
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-mozconfig,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- thunderbird-mozconfig 26 Jun 2010 08:09:53 -0000 1.4
+++ thunderbird-mozconfig 17 Jul 2011 20:43:47 -0000 1.5
@@ -1,6 +1,6 @@
mk_add_options MOZ_CO_PROJECT=mail
ac_add_options --enable-application=mail
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir-tb/
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@
mk_add_options AUTOCONF=autoconf-2.13
#ac_add_options --with-system-png
@@ -15,7 +15,7 @@
ac_add_options --disable-tests
ac_add_options --disable-debug
ac_add_options --disable-installer
-ac_add_options --enable-optimize="$RPM_OPT_FLAGS"
+ac_add_options --enable-optimize
ac_add_options --enable-xinerama
ac_add_options --enable-default-toolkit=cairo-gtk2
ac_add_options --disable-xprint
@@ -28,6 +28,9 @@
ac_add_options --enable-system-hunspell
ac_add_options --disable-crashreporter
ac_add_options --disable-necko-wifi
+ac_add_options --disable-updater
+#ac_add_options --enable-static
+ac_add_options --enable-startup-notification
export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1
--- enigmail-1.1.2-perm.patch DELETED ---
--- mozilla-jemalloc.patch DELETED ---
--- remove-static.patch DELETED ---
--- thunderbird-shared-error.patch DELETED ---
--- xulrunner-1.9.2.1-build.patch DELETED ---
--- xulrunner-missing-headers.patch DELETED ---
12 years, 10 months
rpms/nvidia-kmod/F-15 nvidia-kmod.spec,1.87,1.88
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10271
Modified Files:
nvidia-kmod.spec
Log Message:
Fix back condition
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-15/nvidia-kmod.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- nvidia-kmod.spec 17 Jul 2011 12:06:20 -0000 1.87
+++ nvidia-kmod.spec 17 Jul 2011 13:11:57 -0000 1.88
@@ -51,7 +51,7 @@
%ifarch %{ix86}
cp -a nvidiapkg-x86 _kmod_build_${kernel_version%%___*}
%else
- cp -a nvidiapkg-x86_64 _kmod_build_${kernel_version%%___*}
+ cp -a nvidiapkg-x64 _kmod_build_${kernel_version%%___*}
%endif
done
12 years, 10 months
rpms/nvidia-kmod/F-15 nvidia-kmod.spec, 1.86, 1.87 sources, 1.32, 1.33 .cvsignore, 1.32, 1.33
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28684
Modified Files:
nvidia-kmod.spec sources .cvsignore
Log Message:
Update to 275.19
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-15/nvidia-kmod.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- nvidia-kmod.spec 12 Jul 2011 11:01:19 -0000 1.86
+++ nvidia-kmod.spec 17 Jul 2011 12:06:20 -0000 1.87
@@ -3,13 +3,13 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+#define buildforkernels newest
Name: nvidia-kmod
Epoch: 1
-Version: 275.09.07
+Version: 275.19
# Taken over by kmodtool
-Release: 1%{?dist}.2
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -86,6 +86,9 @@
%changelog
+* Sun Jul 17 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:275.19-1
+- Update to 275.19
+
* Tue Jul 12 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:275.09.07-1.2
- Rebuild for updated kernel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-15/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources 14 Jun 2011 20:44:30 -0000 1.32
+++ sources 17 Jul 2011 12:06:20 -0000 1.33
@@ -1 +1 @@
-0a75d7a4e929c9140e3808ac7577c676 nvidia-kmod-data-275.09.07.tar.bz2
+5af8568aff1f748fa29032b2acc824fb nvidia-kmod-data-275.19.tar.bz2
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-15/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore 14 Jun 2011 20:44:30 -0000 1.32
+++ .cvsignore 17 Jul 2011 12:06:21 -0000 1.33
@@ -1 +1 @@
-nvidia-kmod-data-275.09.07.tar.bz2
+nvidia-kmod-data-275.19.tar.bz2
12 years, 10 months
rpms/xorg-x11-drv-nvidia/F-15 xorg-x11-drv-nvidia.spec, 1.62, 1.63 sources, 1.32, 1.33 .cvsignore, 1.32, 1.33
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26252
Modified Files:
xorg-x11-drv-nvidia.spec sources .cvsignore
Log Message:
Update to 275.19
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-15/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- xorg-x11-drv-nvidia.spec 14 Jun 2011 20:36:13 -0000 1.62
+++ xorg-x11-drv-nvidia.spec 17 Jul 2011 12:01:44 -0000 1.63
@@ -6,7 +6,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 275.09.07
+Version: 275.19
Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
@@ -341,6 +341,9 @@
%changelog
+* Sun Jul 17 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:275.19-1
+- Update to 275.19
+
* Tue Jun 14 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:275.09.07-1
- Update to 275.09.07
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-15/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources 14 Jun 2011 20:36:13 -0000 1.32
+++ sources 17 Jul 2011 12:01:44 -0000 1.33
@@ -1,2 +1,2 @@
-d779057af3a2f96a05ddda201606618b NVIDIA-Linux-x86-275.09.07.run
-29f28cd59e2647cdb517eca2381d3dbd NVIDIA-Linux-x86_64-275.09.07.run
+9e74b1913ff5eb6786600d47b64ba57d NVIDIA-Linux-x86-275.19.run
+7ea4a54865f19f0b8f7e3b89274aace1 NVIDIA-Linux-x86_64-275.19.run
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-15/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore 14 Jun 2011 20:36:13 -0000 1.32
+++ .cvsignore 17 Jul 2011 12:01:44 -0000 1.33
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-275.09.07.run
-NVIDIA-Linux-x86_64-275.09.07.run
+NVIDIA-Linux-x86-275.19.run
+NVIDIA-Linux-x86_64-275.19.run
12 years, 10 months
rpms/gecko-mediaplayer/devel gecko-mediaplayer.spec,1.31,1.32
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gecko-mediaplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10791
Modified Files:
gecko-mediaplayer.spec
Log Message:
* Sat Jul 16 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.4-4
- Added an easy way to pick between GSettings and GConf2
- Rearranged the conditionals to avoid leaving empty %pre et al.
Index: gecko-mediaplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/devel/gecko-mediaplayer.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gecko-mediaplayer.spec 8 Jul 2011 07:21:01 -0000 1.31
+++ gecko-mediaplayer.spec 17 Jul 2011 01:06:14 -0000 1.32
@@ -1,6 +1,12 @@
+%if 0%{?fedora} < 15
+%bcond_without gconf
+%else
+%bcond_with gconf
+%endif
+
Name: gecko-mediaplayer
Version: 1.0.4
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Gnome MPlayer browser plugin
Group: Applications/Multimedia
@@ -11,7 +17,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dbus-glib-devel
-%if 0%{?fedora} < 15
+%if %{with gconf}
BuildRequires: GConf2-devel
%endif
BuildRequires: gettext
@@ -22,7 +28,7 @@
Requires: mozilla-filesystem
Requires: gnome-mplayer-binary >= %{version}
-%if 0%{?fedora} < 15
+%if %{with gconf}
Requires(pre): GConf2
Requires(post): GConf2
Requires(preun): GConf2
@@ -42,17 +48,13 @@
%build
-%if 0%{?fedora} == 14
-%configure --with-gconf
-%else
-%configure
-%endif
+%configure %{?with_gconf:--with-gconf}
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-%if 0%{?fedora} < 15
+%if %{with gconf}
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
%endif
make install DESTDIR=$RPM_BUILD_ROOT
@@ -62,20 +64,20 @@
rm -rf $RPM_BUILD_ROOT%{_docdir}/gecko-mediaplayer
+%if %{with gconf}
%pre
-%if 0%{?fedora} < 15
%gconf_schema_prepare gecko-mediaplayer
%endif
+%if %{with gconf}
%post
-%if 0%{?fedora} < 15
%gconf_schema_upgrade gecko-mediaplayer
%endif
+%if %{with gconf}
%preun
-%if 0%{?fedora} < 15
%gconf_schema_remove gecko-mediaplayer
%endif
@@ -87,7 +89,7 @@
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING ChangeLog
-%if 0%{?fedora} < 15
+%if %{with gconf}
%{_sysconfdir}/gconf/schemas/gecko-mediaplayer.schemas
%endif
%{_libdir}/mozilla/plugins/gecko-mediaplayer-dvx.so
@@ -98,6 +100,10 @@
%changelog
+* Sat Jul 16 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.4-4
+- Added an easy way to pick between GSettings and GConf2
+- Rearranged the conditionals to avoid leaving empty %%pre et al.
+
* Fri Jul 08 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.4-3
- Updated the apple.com fix
12 years, 10 months
rpms/gnome-mplayer/devel gnome-mplayer.spec,1.37,1.38
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10546
Modified Files:
gnome-mplayer.spec
Log Message:
* Sat Jul 16 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.4-3
- Added an easy way to pick between GSettings and GConf2
- Rearranged the conditionals to avoid leaving empty %pre et al.
Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/devel/gnome-mplayer.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- gnome-mplayer.spec 8 Jul 2011 07:38:35 -0000 1.37
+++ gnome-mplayer.spec 17 Jul 2011 01:04:08 -0000 1.38
@@ -1,8 +1,14 @@
%bcond_without minimal
+%if 0%{?fedora} < 15
+%bcond_without gconf
+%else
+%bcond_with gconf
+%endif
+
Name: gnome-mplayer
Version: 1.0.4
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: An MPlayer GUI, a full-featured binary
Group: Applications/Multimedia
@@ -15,7 +21,7 @@
BuildRequires: alsa-lib-devel
BuildRequires: dbus-glib-devel
BuildRequires: desktop-file-utils
-%if 0%{?fedora} < 15
+%if %{with gconf}
BuildRequires: GConf2-devel
%endif
BuildRequires: gettext
@@ -53,7 +59,7 @@
Group: Applications/Multimedia
Requires: mplayer
-%if 0%{?fedora} < 15
+%if %{with gconf}
Requires(pre): GConf2
Requires(post): GConf2
Requires(preun): GConf2
@@ -118,13 +124,9 @@
%build
pushd generic
%if 0%{?fedora} >= 15
-%configure --enable-gtk3
-%else
-%if 0%{?fedora} == 14
-%configure --with-gconf
+%configure --enable-gtk3 %{?with_gconf:--with-gconf}
%else
-%configure
-%endif
+%configure %{?with_gconf:--with-gconf}
%endif
make %{?_smp_mflags}
popd
@@ -134,12 +136,9 @@
%configure --program-suffix=-minimal --without-gio --without-libnotify \
%if 0%{?fedora} >= 15
--enable-gtk3 \
-%else
-%if 0%{?fedora} == 14
- --with-gconf \
-%endif
%endif
- --without-libgpod --without-libmusicbrainz3 --disable-nautilus
+ --without-libgpod --without-libmusicbrainz3 --disable-nautilus \
+ %{?with_gconf:--with-gconf}
make %{?_smp_mflags}
popd
%endif
@@ -149,7 +148,7 @@
rm -rf $RPM_BUILD_ROOT
pushd generic
-%if 0%{?fedora} < 15
+%if %{with gconf}
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
%endif
make install DESTDIR=$RPM_BUILD_ROOT
@@ -157,7 +156,7 @@
%if %{with minimal}
pushd minimal
-%if 0%{?fedora} < 15
+%if %{with gconf}
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
%endif
make install DESTDIR=$RPM_BUILD_ROOT
@@ -176,8 +175,8 @@
find $RPM_BUILD_ROOT -name *.la -exec rm -f {} \;
+%if %{with gconf}
%pre common
-%if 0%{?fedora} < 15
%gconf_schema_prepare gnome-mplayer
%endif
@@ -189,8 +188,8 @@
update-desktop-database &> /dev/null || :
+%if %{with gconf}
%post common
-%if 0%{?fedora} < 15
%gconf_schema_upgrade gnome-mplayer
%endif
@@ -200,7 +199,7 @@
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
-%if 0%{?fedora} >= 15
+%if ! %{with gconf}
if [ $1 -eq 0 ] ; then
glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
fi
@@ -209,13 +208,13 @@
%posttrans common
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-%if 0%{?fedora} >= 15
+%if ! %{with gconf}
glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%endif
+%if %{with gconf}
%preun common
-%if 0%{?fedora} < 15
%gconf_schema_remove gnome-mplayer
%endif
@@ -234,7 +233,7 @@
%files common -f %{name}.lang
%defattr(-,root,root,-)
%doc generic/COPYING generic/ChangeLog generic/README generic/DOCS/keyboard_shortcuts.txt generic/DOCS/tech/*
-%if 0%{?fedora} < 15
+%if %{with gconf}
%{_sysconfdir}/gconf/schemas/gnome-mplayer.schemas
%else
%{_datadir}/glib-2.0/schemas/apps.gecko-mediaplayer.preferences.gschema.xml
@@ -257,6 +256,10 @@
%changelog
+* Sat Jul 16 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.4-3
+- Added an easy way to pick between GSettings and GConf2
+- Rearranged the conditionals to avoid leaving empty %%pre et al.
+
* Fri Jul 08 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.4-2
- Fixed apple.com regression using a patch from SVN
12 years, 10 months
rpms/avidemux/devel avidemux-2.5.5-x264_i_to_b_open_gop.patch, NONE, 1.1 avidemux.spec, 1.50, 1.51
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31913
Modified Files:
avidemux.spec
Added Files:
avidemux-2.5.5-x264_i_to_b_open_gop.patch
Log Message:
* Fri Jul 15 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-3
- Add patch to fix x264 ABI 115 change (#1848)
avidemux-2.5.5-x264_i_to_b_open_gop.patch:
encoder.cpp | 4 +++-
x264Options.cpp | 14 +++++++++++++-
2 files changed, 16 insertions(+), 2 deletions(-)
--- NEW FILE avidemux-2.5.5-x264_i_to_b_open_gop.patch ---
diff -Naur avidemux_2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp avidemux_2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp
--- avidemux_2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2010-10-03 11:54:51.000000000 -0500
+++ avidemux_2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-07-15 10:58:18.970492678 -0500
@@ -488,8 +488,10 @@
printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8);
printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter);
printf("[x264] b_cabac = %d\n", x264Param->b_cabac);
-#if X264_BUILD > 101
+#if X264_BUILD > 101 && X264_BUILD < 115
printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop);
+#elif X264_BUILD > 114
+ printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop);
#endif
printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced);
#if X264_BUILD > 88
diff -Naur avidemux_2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
--- avidemux_2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2010-12-31 15:23:09.000000000 -0600
+++ avidemux_2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-07-15 11:00:32.108021056 -0500
@@ -417,7 +417,7 @@
_param.b_cabac = cabac;
}
-#if X264_BUILD > 101
+#if X264_BUILD > 101 && X264_BUILD < 115
unsigned int x264Options::getOpenGopMode(void)
{
return _param.i_open_gop;
@@ -428,6 +428,18 @@
if (openGopMode < 3)
_param.i_open_gop = openGopMode;
}
+
+#elif X264_BUILD > 114
+unsigned int x264Options::getOpenGopMode(void)
+{
+ return _param.b_open_gop;
+}
+
+void x264Options::setOpenGopMode(unsigned int openGopMode)
+{
+ if (openGopMode < 3)
+ _param.b_open_gop = openGopMode;
+}
#endif
unsigned int x264Options::getInterlaced(void)
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- avidemux.spec 14 Jul 2011 22:06:46 -0000 1.50
+++ avidemux.spec 15 Jul 2011 17:22:39 -0000 1.51
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.5.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -48,6 +48,8 @@
Patch10: avidemux-2.5.4-libmad.patch
Patch11: avidemux-2.5.4-libtwolame.patch
Patch12: avidemux-2.5.5_fix_lav_audio_encoder.patch
+# Fix for x264 ABI 115 change.
+Patch13: avidemux-2.5.5-x264_i_to_b_open_gop.patch
# Uses a header file not found in the standard package
#Patch16: avidemux-2.5.4-mpeg2enc.patch
@@ -213,6 +215,7 @@
%patch10 -p1 -b .libmad
%patch11 -p1 -b .libtwolame
%patch12 -p1 -b .lavencode
+%patch13 -p1 -b .x264plugin
%build
@@ -321,6 +324,9 @@
%{_includedir}/ADM_coreConfig.h
%changelog
+* Fri Jul 15 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-3
+- Add patch to fix x264 ABI 115 change (#1848)
+
* Fri Jul 15 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 2.5.5-2
- Rebuilt for x264 ABI 115
12 years, 10 months
rpms/mame/F-14 .cvsignore, 1.31, 1.32 mame.spec, 1.37, 1.38 sources, 1.31, 1.32
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20308
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Fri Jul 15 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.143u1-1
- Updated to 0.143u1
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-14/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore 29 Jun 2011 16:26:29 -0000 1.31
+++ .cvsignore 15 Jul 2011 15:14:10 -0000 1.32
@@ -1 +1,2 @@
mame0143s.exe
+0143u1_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-14/mame.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mame.spec 29 Jun 2011 16:26:29 -0000 1.37
+++ mame.spec 15 Jul 2011 15:14:10 -0000 1.38
@@ -5,7 +5,7 @@
%bcond_with debug
%global baseversion 143
-#global sourceupdate 6
+%global sourceupdate 1
Name: mame
%if 0%{?sourceupdate}
@@ -23,7 +23,7 @@
Source0: http://www.aarongiles.com/mirror/releases/%{name}0%{baseversion}s.exe
%if 0%{?sourceupdate}
#Source updates
-#Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
+Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
#Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
#Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
#Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
@@ -251,6 +251,9 @@
%changelog
+* Fri Jul 15 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.143u1-1
+- Updated to 0.143u1
+
* Wed Jun 29 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.143-1
- Updated to 0.143
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-14/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources 29 Jun 2011 16:26:29 -0000 1.31
+++ sources 15 Jul 2011 15:14:10 -0000 1.32
@@ -1 +1,2 @@
bd4340940e35e3f19a89aaa949c3dd3c mame0143s.exe
+aa65ea6cde4226b5a9dee89de89bfe19 0143u1_diff.zip
12 years, 10 months