rpms/xtables-addons-kmod/devel xtables-addons-kmod.spec,1.2,1.3
by Chen Lei
Author: supercyper
Update of /cvs/free/rpms/xtables-addons-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21175
Modified Files:
xtables-addons-kmod.spec
Log Message:
Index: xtables-addons-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/devel/xtables-addons-kmod.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xtables-addons-kmod.spec 28 Jun 2010 08:13:28 -0000 1.2
+++ xtables-addons-kmod.spec 28 Jun 2010 08:57:31 -0000 1.3
@@ -41,7 +41,7 @@
%setup -q -c -T -a 0
for kernel_version in %{?kernel_versions} ; do
cp -a xtables-addons-%{version} _kmod_build_${kernel_version%%___*}
- if grep -q 'XT_TARGET_TEE=m' %{ _usrsrc}/${kernel_version%%___*}/.config; then
+ if grep -q 'XT_TARGET_TEE=m' %{_usrsrc}/${kernel_version%%___*}/.config; then
pushd _kmod_build_${kernel_version%%___*}
sed -i 's/build_TEE=m/build_TEE=/' mconfig
popd
14 years, 5 months
rpms/xtables-addons-kmod/devel xtables-addons-kmod.spec,1.1,1.2
by Chen Lei
Author: supercyper
Update of /cvs/free/rpms/xtables-addons-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18043
Modified Files:
xtables-addons-kmod.spec
Log Message:
Index: xtables-addons-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/devel/xtables-addons-kmod.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xtables-addons-kmod.spec 28 Jun 2010 07:42:08 -0000 1.1
+++ xtables-addons-kmod.spec 28 Jun 2010 08:13:28 -0000 1.2
@@ -41,7 +41,7 @@
%setup -q -c -T -a 0
for kernel_version in %{?kernel_versions} ; do
cp -a xtables-addons-%{version} _kmod_build_${kernel_version%%___*}
- if [ -e /lib/modules/${kernel_version%%___*}/kernel/net/*/xt_TEE.ko ]; then
+ if grep -q 'XT_TARGET_TEE=m' %{ _usrsrc}/${kernel_version%%___*}/.config; then
pushd _kmod_build_${kernel_version%%___*}
sed -i 's/build_TEE=m/build_TEE=/' mconfig
popd
14 years, 5 months
rpms/xtables-addons-kmod/devel xtables-addons-kmod.spec, NONE, 1.1 sources, 1.1, 1.2
by Chen Lei
Author: supercyper
Update of /cvs/free/rpms/xtables-addons-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15838
Modified Files:
sources
Added Files:
xtables-addons-kmod.spec
Log Message:
--- NEW FILE xtables-addons-kmod.spec ---
# buildforkernels macro hint: when you build a new version or a new release
# that contains bugfixes or other improvements then you must disable the
# "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 current
#define buildforkernels akmods
Name: xtables-addons-kmod
Summary: Kernel module (kmod) for xtables-addons
Version: 1.27
Release: 2%{?dist}
License: GPLv2
Group: System Environment/Kernel
URL: http://xtables-addons.sourceforge.net
Source0: http://downloads.sourceforge.net/xtables-addons/xtables-addons-%{version}...
#Source11: xtables-addons-kmodtool-excludekernel-filterfile
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# get the needed BuildRequires (in parts depending on what we build for)
BuildRequires: %{_bindir}/kmodtool
%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
# kmodtool does its magic here
%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
%description
Xtables-addons provides extra modules for iptables not present in the kernel,
and is the successor of patch-o-matic. Extensions includes new targets like
TEE, TARPIT, CHAOS, or modules like geoip, ipset, and account.
This package provides the xtables-addons kernel modules. You must also install
the xtables-addons package in order to make use of these modules.
%prep
# error out if there was something wrong with kmodtool
%{?kmodtool_check}
# print kmodtool output for debugging purposes:
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
%setup -q -c -T -a 0
for kernel_version in %{?kernel_versions} ; do
cp -a xtables-addons-%{version} _kmod_build_${kernel_version%%___*}
if [ -e /lib/modules/${kernel_version%%___*}/kernel/net/*/xt_TEE.ko ]; then
pushd _kmod_build_${kernel_version%%___*}
sed -i 's/build_TEE=m/build_TEE=/' mconfig
popd
fi
done
%build
for kernel_version in %{?kernel_versions} ; do
export XA_ABSTOPSRCDIR=${PWD}/_kmod_build_${kernel_version%%___*}
make %{?_smp_mflags} V=1 -C "${kernel_version##*___}" M=${PWD}/_kmod_build_${kernel_version%%___*}/extensions modules
done
%install
rm -rf %{buildroot}
for kernel_version in %{?kernel_versions} ; do
export XA_ABSTOPSRCDIR=${PWD}/_kmod_build_${kernel_version%%___*}
make %{?_smp_mflags} V=1 -C "${kernel_version##*___}" M=${PWD}/_kmod_build_${kernel_version%%___*}/extensions _emodinst_ INSTALL_MOD_PATH=%{buildroot} ext-mod-dir=%{kmodinstdir_postfix}
done
chmod u+x %{buildroot}/lib/modules/*/extra/*/*
%{?akmod_install}
%clean
rm -rf %{buildroot}
%changelog
* Mon Jun 28 2010 Chen Lei <supercyper(a)163.com> - 1.27-2
- rebuild for kernel 2.6.35
* Mon May 31 2010 Chen Lei <supercyper(a)163.com> - 1.27-1
- update to 1.27
* Thu May 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.26-1.4
- rebuild for new kernel
* Mon May 17 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.26-1.3
- rebuild for new kernel
* Fri May 07 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.26-1.2
- rebuild for new kernel
* Tue May 04 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.26-1.1
- rebuild for new kernel
* Sun May 02 2010 Chen Lei <supercyper(a)163.com> - 1.26-1
- update to 1.26
* Thu Apr 29 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.25-1.1
- rebuild for new kernel
* Mon Apr 26 2010 Chen Lei <supercyper(a)163.com> - 1.25-1
- update to 1.25
* Sun Apr 25 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.24-1.1
- rebuild for new kernel
* Thu Mar 18 2010 Chen Lei <supercyper(a)163.com> - 1.24-1
- initial rpm build
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 12 Apr 2010 20:51:03 -0000 1.1
+++ sources 28 Jun 2010 07:42:07 -0000 1.2
@@ -0,0 +1 @@
+f4f65ce5361d7f8c0908ca3db37fa8ee xtables-addons-1.27.tar.xz
14 years, 5 months
rpms/audacity-freeworld/devel .cvsignore, 1.6, 1.7 audacity-freeworld.spec, 1.12, 1.13 sources, 1.6, 1.7
by David Timms
Author: dtimms
Update of /cvs/free/rpms/audacity-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22501
Modified Files:
.cvsignore audacity-freeworld.spec sources
Log Message:
- upgrade to 1.3.12-beta
- package new icons found in icons/hicolor
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 6 Dec 2009 01:35:41 -0000 1.6
+++ .cvsignore 27 Jun 2010 14:41:58 -0000 1.7
@@ -1 +1 @@
-audacity-minsrc-1.3.10.tar.bz2
+audacity-minsrc-1.3.12-beta.tar.bz2
Index: audacity-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/devel/audacity-freeworld.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- audacity-freeworld.spec 6 Dec 2009 01:35:41 -0000 1.12
+++ audacity-freeworld.spec 27 Jun 2010 14:41:58 -0000 1.13
@@ -1,18 +1,18 @@
-%define tartopdir audacity-src-1.3.10
+%define tartopdir audacity-src-1.3.12-beta
Name: audacity-freeworld
%define realname audacity
Conflicts: %{realname}
-Version: 1.3.10
+Version: 1.3.12
Release: 0.1.1.beta%{?dist}
Summary: Multitrack audio editor
-Group: Applications/Multimedia
+Group: Applications/Multimedia
License: GPLv2
-URL: http://audacity.sourceforge.net
+URL: http://audacity.sourceforge.net
-Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%{version}.t...
+Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%{version}-b...
Source1: audacity.png
Source2: audacity.desktop
@@ -77,7 +77,7 @@
%if 0%{?fedora} < 11
%patch6 -p1 -b .vamp-1.3
%endif
-%patch7 -p1 -b .getmaxpeak
+#%#patch7 -p1 -b .getmaxpeak
# Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
for i in locale/*.po src/export/ExportMP3.cpp
@@ -149,11 +149,16 @@
%{_mandir}/man*/*
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/mime/packages/*
%doc %{_datadir}/doc/*
%changelog
+* Mon Jun 28 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.1.1.beta
+- upgrade to 1.3.12-beta
+- package new icons found in icons/hicolor
+
* Sat Dec 5 2009 David Timms <iinet.net.au@dtimms> - 1.3.10-0.1.1.beta
- upgrade to 1.3.10-beta
- re-base spec to fedora devel and patches by mschwendt
Index: sources
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 6 Dec 2009 01:35:41 -0000 1.6
+++ sources 27 Jun 2010 14:41:58 -0000 1.7
@@ -1 +1 @@
-ffa698188e2e8f48c499268a478c579c audacity-minsrc-1.3.10.tar.bz2
+76996fec67181ca82ba191e012518b57 audacity-minsrc-1.3.12-beta.tar.bz2
14 years, 5 months
rpms/thunderbird-enigmail/devel sources, 1.7, 1.8 thunderbird-enigmail.spec, 1.7, 1.8
by Remi Collet
Author: remi
Update of /cvs/free/rpms/thunderbird-enigmail/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30088
Modified Files:
sources thunderbird-enigmail.spec
Log Message:
update sources
Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 26 Jun 2010 08:09:53 -0000 1.7
+++ sources 26 Jun 2010 17:54:40 -0000 1.8
@@ -1,2 +1,2 @@
feb4d737d568066076879a09bd0d506e thunderbird-3.1.source.tar.bz2
-3f67c2caf316a668894833d18e41919a enigmail-1.1.1.tar.gz
+a0f424cf2eb3a29a6cbb70669a0765bc enigmail-1.1.1.tar.gz
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-enigmail.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- thunderbird-enigmail.spec 26 Jun 2010 08:56:19 -0000 1.7
+++ thunderbird-enigmail.spec 26 Jun 2010 17:54:40 -0000 1.8
@@ -28,7 +28,7 @@
%if 0%{?prever:1}
Release: 0.1.%{prever}%{?dist}
%else
-Release: 1%{?dist}.1
+Release: 2%{?dist}
%endif
URL: http://enigmail.mozdev.org/
License: MPLv1.1 or GPLv2+
@@ -237,7 +237,7 @@
%{__unzip} -q %{moz_objdir}/mozilla/dist/bin/enigmail-*-linux-*.xpi -d $RPM_BUILD_ROOT%{_libdir}/%{name}
%{__install} -p -m 755 %{SOURCE102} $RPM_BUILD_ROOT%{_libdir}/%{name}/mozilla-extension-update.sh
-
+%{__chmod} +x $RPM_BUILD_ROOT%{_libdir}/%{name}/wrappers/*.sh
%clean
@@ -283,6 +283,9 @@
#===============================================================================
%changelog
+* Sat Jun 26 2010 Remi Collet <rpms(a)famillecollet.com> 1.1.1-2
+- new sources (only fix displayed version)
+
* Sat Jun 26 2010 Remi Collet <rpms(a)famillecollet.com> 1.1.1-1.1
- missing BR libnotify-devel
14 years, 5 months
rpms/thunderbird-enigmail/devel thunderbird-enigmail.spec,1.6,1.7
by Remi Collet
Author: remi
Update of /cvs/free/rpms/thunderbird-enigmail/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25152
Modified Files:
thunderbird-enigmail.spec
Log Message:
missing BR libnotify-devel
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-enigmail.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- thunderbird-enigmail.spec 26 Jun 2010 08:09:53 -0000 1.6
+++ thunderbird-enigmail.spec 26 Jun 2010 08:56:19 -0000 1.7
@@ -3,6 +3,7 @@
%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
%global thunver 3.1
@@ -27,7 +28,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+
@@ -75,6 +76,7 @@
BuildRequires: nspr-devel >= %{nspr_version}
BuildRequires: nss-devel >= %{nss_version}
BuildRequires: cairo-devel >= %{cairo_version}
+BuildRequires: libnotify-devel >= %{libnotify_version}
BuildRequires: libpng-devel
BuildRequires: libjpeg-devel
BuildRequires: zip
@@ -281,6 +283,9 @@
#===============================================================================
%changelog
+* Sat Jun 26 2010 Remi Collet <rpms(a)famillecollet.com> 1.1.1-1.1
+- missing BR libnotify-devel
+
* Sat Jun 26 2010 Remi Collet <rpms(a)famillecollet.com> 1.1.1-1
- Enigmail 1.1.1 (against thunderbird 3.1)
14 years, 5 months
rpms/thunderbird-enigmail/devel thunderbird-version.patch, NONE, 1.1 xulrunner-1.9.2.1-build.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 thunderbird-enigmail.spec, 1.5, 1.6 thunderbird-mozconfig, 1.3, 1.4 thunderbird-shared-error.patch, 1.3, 1.4 thunderbird-3.0-ppc64.patch, 1.1, NONE thunderbird-clipboard-crash.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-serv22013
Modified Files:
.cvsignore sources thunderbird-enigmail.spec
thunderbird-mozconfig thunderbird-shared-error.patch
Added Files:
thunderbird-version.patch xulrunner-1.9.2.1-build.patch
Removed Files:
thunderbird-3.0-ppc64.patch thunderbird-clipboard-crash.patch
Log Message:
update to enigmail 1.1.1 for thunderbird 3.1
thunderbird-version.patch:
Makefile.in | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE thunderbird-version.patch ---
diff -up comm-1.9.2/mail/installer/Makefile.in.version comm-1.9.2/mail/installer/Makefile.in
--- comm-1.9.2/mail/installer/Makefile.in.version 2010-05-21 11:42:45.000000000 -0700
+++ comm-1.9.2/mail/installer/Makefile.in 2010-05-25 15:16:18.446197181 -0700
@@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
+MOZ_APP_VERSION="__RPM_VERSION_INTERNAL__"
+
MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
xulrunner-1.9.2.1-build.patch:
nsFrame.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE xulrunner-1.9.2.1-build.patch ---
diff -up xulrunner-1.9.2.1/mozilla-1.9.2/layout/generic/nsFrame.h.old xulrunner-1.9.2.1/mozilla-1.9.2/layout/generic/nsFrame.h
--- xulrunner-1.9.2.1/mozilla/layout/generic/nsFrame.h.old 2009-11-11 15:34:51.000000000 +0100
+++ xulrunner-1.9.2.1/mozilla/layout/generic/nsFrame.h 2009-11-11 15:33:09.000000000 +0100
@@ -157,7 +157,7 @@ private:
// Left undefined; nsFrame objects are never allocated from the heap.
void* operator new(size_t sz) CPP_THROW_NEW;
-protected:
+public:
// Overridden to prevent the global delete from being called, since
// the memory came out of an arena instead of the heap.
//
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 1 Feb 2010 16:13:54 -0000 1.6
+++ .cvsignore 26 Jun 2010 08:09:53 -0000 1.7
@@ -1,2 +1,2 @@
-thunderbird-3.0.1.source.tar.bz2
-enigmail-1.0.1.tar.gz
+thunderbird-3.1.source.tar.bz2
+enigmail-1.1.1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 1 Feb 2010 16:13:54 -0000 1.6
+++ sources 26 Jun 2010 08:09:53 -0000 1.7
@@ -1,2 +1,2 @@
-f004aa5ddf2a30b5df96e06df416b0c9 thunderbird-3.0.1.source.tar.bz2
-508ca9ab0396afb49e82eda88014924b enigmail-1.0.1.tar.gz
+feb4d737d568066076879a09bd0d506e thunderbird-3.1.source.tar.bz2
+3f67c2caf316a668894833d18e41919a enigmail-1.1.1.tar.gz
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-enigmail.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- thunderbird-enigmail.spec 1 Feb 2010 16:13:54 -0000 1.5
+++ thunderbird-enigmail.spec 26 Jun 2010 08:09:53 -0000 1.6
@@ -2,12 +2,10 @@
%global nss_version 3.12.3.99
%global cairo_version 1.8.8
%global freetype_version 2.1.9
-%global sqlite_version 3.6.14
-%global build_langpacks 1
+%global sqlite_version 3.6.22
%global moz_objdir objdir-tb
-%global thunver 3.0.1
-#global CVS 20091121
+%global thunver 3.1
# The tarball is pretty inconsistent with directory structure.
# Sometimes there is a top level directory. That goes here.
@@ -15,25 +13,26 @@
# IMPORTANT: If there is no top level directory, this should be
# set to the cwd, ie: '.'
#%define tarballdir .
-%global tarballdir comm-1.9.1
+%global tarballdir comm-1.9.2
%global official_branding 1
-%global version_internal 3.0
+%global version_internal 3.1
%global mozappdir %{_libdir}/%{name}-%{version_internal}
+
Summary: Authentication and encryption extension for Mozilla Thunderbird
Name: thunderbird-enigmail
-Version: 1.0.1
-%if 0%{?CVS}
-Release: 0.1.cvs%{CVS}%{?dist}
+Version: 1.1.1
+%if 0%{?prever:1}
+Release: 0.1.%{prever}%{?dist}
%else
Release: 1%{?dist}
%endif
URL: http://enigmail.mozdev.org/
License: MPLv1.1 or GPLv2+
Group: Applications/Internet
-Source0: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{thunve...
+Source0: thunderbird-%{thunver}%{?thunbeta}.source.tar.bz2
Source10: thunderbird-mozconfig
Source11: thunderbird-mozconfig-branded
@@ -46,7 +45,7 @@
# tar czf /home/rpmbuild/SOURCES/enigmail-20091121.tgz --exclude CVS -C enigmail/src .
Source100: enigmail-%{CVS}.tgz
%else
-Source100: http://www.mozilla-enigmail.org/download/source/enigmail-%{version}.tar.gz
+Source100: http://www.mozilla-enigmail.org/download/source/enigmail-%{version}%{?pre...
%endif
# http://www.mozdev.org/pipermail/enigmail/2009-April/011018.html
@@ -55,22 +54,21 @@
# From sunbird.src.rpm
Source102: mozilla-extension-update.sh
-# Build patches
+# 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
-Patch4: thunderbird-clipboard-crash.patch
-
-Patch9: thunderbird-3.0-ppc64.patch
-
+# Fixes gcc complain that nsFrame::delete is protected
+Patch4: xulrunner-1.9.2.1-build.patch
%if %{official_branding}
# Required by Mozilla Corporation
-
%else
# Not yet approved by Mozillla Corporation
-
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -137,20 +135,20 @@
%setup -q -c
cd %{tarballdir}
+sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
+ > version.patch
+%{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch
+
%patch1 -p0 -b .jemalloc
%patch2 -p1 -b .shared-error
-%patch4 -p1 -b .clipboard-crash
-
-%patch9 -p0 -b .ppc64
+%patch4 -p1 -b .protected
%if %{official_branding}
# Required by Mozilla Corporation
-
%else
# Not yet approved by Mozillla Corporation
-
%endif
@@ -183,6 +181,9 @@
%build
cd %{tarballdir}
+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//')
@@ -280,6 +281,9 @@
#===============================================================================
%changelog
+* Sat Jun 26 2010 Remi Collet <rpms(a)famillecollet.com> 1.1.1-1
+- Enigmail 1.1.1 (against thunderbird 3.1)
+
* Mon Feb 01 2010 Remi Collet <rpms(a)famillecollet.com> 1.0.1-1
- Enigmail 1.0.1 (against thunderbird 3.0.1)
Index: thunderbird-mozconfig
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-mozconfig,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- thunderbird-mozconfig 1 Feb 2010 16:13:54 -0000 1.3
+++ thunderbird-mozconfig 26 Jun 2010 08:09:53 -0000 1.4
@@ -27,6 +27,7 @@
ac_add_options --enable-canvas
ac_add_options --enable-system-hunspell
ac_add_options --disable-crashreporter
+ac_add_options --disable-necko-wifi
export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1
thunderbird-shared-error.patch:
Makefile.in | 2 ++
1 file changed, 2 insertions(+)
Index: thunderbird-shared-error.patch
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-shared-error.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- thunderbird-shared-error.patch 21 Nov 2009 12:38:17 -0000 1.3
+++ thunderbird-shared-error.patch 26 Jun 2010 08:09:53 -0000 1.4
@@ -11,5 +11,6 @@
endif
+endif
- # On mozilla-central, packager.mk uses core_abspath to redefine DIST
- # As the comm-central config.mk doesn't set it, do it ourselves instead
+ include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
+
+
--- thunderbird-3.0-ppc64.patch DELETED ---
--- thunderbird-clipboard-crash.patch DELETED ---
14 years, 5 months
rpms/VirtualBox-OSE/devel VirtualBox-OSE.spec,1.55,1.56
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15196
Modified Files:
VirtualBox-OSE.spec
Log Message:
Another crack ad fixing the keyboard tarball build
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- VirtualBox-OSE.spec 18 Jun 2010 09:00:08 -0000 1.55
+++ VirtualBox-OSE.spec 23 Jun 2010 11:55:08 -0000 1.56
@@ -167,7 +167,8 @@
VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \
KMK_REVISION=3000 KBUILD_KMK_REVISION=3000 \
VBOX_GCC_OPT="%{optflags}" VBOX_GCC_GC_OPT="%{optflags}" \
- VBOX_GCC_R0_OPT="%{optflags}" VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL"
+ VBOX_GCC_R0_OPT="%{optflags}" VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \
+ VBOX_KEYBOARD_DEST_DIR="$PWD/obj/obj/VBoxKeyboard/install"
%install
@@ -340,7 +341,7 @@
-not -name 'VBox.sh' \
-not -name 'xpidl' \
-not -name 'scm' \
- -not -name 'vboxkeyboard.tar.gz' \
+ -not -name 'vboxkeyboard.tar.*' \
-exec basename '{}' \;) |sort) \
<(find $RPM_BUILD_ROOT%{_libdir}/virtualbox/* \
$RPM_BUILD_ROOT%{_bindir}/* \
14 years, 5 months
rpms/freeguide/devel .cvsignore,1.3,1.4 sources,1.3,1.4
by Iain Arnell
Author: iarnell
Update of /cvs/free/rpms/freeguide/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24843
Modified Files:
.cvsignore sources
Log Message:
upload sources
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/freeguide/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 11 Dec 2009 17:09:38 -0000 1.3
+++ .cvsignore 23 Jun 2010 06:21:49 -0000 1.4
@@ -1 +1 @@
-freeguide-0.10.12.tar.gz
+freeguide-0.11.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/freeguide/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 11 Dec 2009 17:09:38 -0000 1.3
+++ sources 23 Jun 2010 06:21:50 -0000 1.4
@@ -1 +1 @@
-9bc51dda18506794da8021e98e52305f freeguide-0.10.12.tar.gz
+15bba69e5fde5db43690fed5bf35b8ba freeguide-0.11.tar.gz
14 years, 5 months
rpms/freeguide/devel 0001-disable-check-for-updates.patch, NONE, 1.1 freeguide.spec, 1.2, 1.3 disable-check-for-updates.patch, 1.1, NONE no-jalopy-retroweaver.patch, 1.2, NONE
by Iain Arnell
Author: iarnell
Update of /cvs/free/rpms/freeguide/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24409
Modified Files:
freeguide.spec
Added Files:
0001-disable-check-for-updates.patch
Removed Files:
disable-check-for-updates.patch no-jalopy-retroweaver.patch
Log Message:
* Wed Jun 23 2010 Iain Arnell <iarnell(a)gmail.com> 0.11-1
- update to latest upstream version
- remove no-jalopy-retroweaver patch
- rebase disable-check-for-updates patch
- Americanize spelling in description
0001-disable-check-for-updates.patch:
options/OptionsDialog.java | 8 --------
viewer/MainController.java | 6 ------
wizard/FirstTimeWizard.java | 2 --
3 files changed, 16 deletions(-)
--- NEW FILE 0001-disable-check-for-updates.patch ---
>From e2622d46b6ca8ce2009ce7394588d351a4ed2b18 Mon Sep 17 00:00:00 2001
From: Iain Arnell <iarnell(a)gmail.com>
Date: Wed, 23 Jun 2010 07:47:45 +0200
Subject: [PATCH] disable check for updates
---
.../program/freeguide/options/OptionsDialog.java | 8 --------
.../program/freeguide/viewer/MainController.java | 6 ------
.../program/freeguide/wizard/FirstTimeWizard.java | 1 -
3 files changed, 0 insertions(+), 15 deletions(-)
diff --git a/src/freeguide/plugins/program/freeguide/options/OptionsDialog.java b/src/freeguide/plugins/program/freeguide/options/OptionsDialog.java
index 3f255c6..dcecbc8 100644
--- a/src/freeguide/plugins/program/freeguide/options/OptionsDialog.java
+++ b/src/freeguide/plugins/program/freeguide/options/OptionsDialog.java
@@ -181,14 +181,6 @@ public class OptionsDialog extends FGDialog implements TreeSelectionListener,
trunk.add( horzViewer );
- OptionPanel panel = new PrivacyOptionPanel( this );
-
- DefaultMutableTreeNode privateLeaf =
- new DefaultMutableTreeNode( panel );
- panel.construct( );
-
- trunk.add( privateLeaf );
-
DefaultMutableTreeNode advancedBranch =
new DefaultMutableTreeNode(
Application.getInstance( ).getLocalizedMessage( "advanced" ) );
diff --git a/src/freeguide/plugins/program/freeguide/viewer/MainController.java b/src/freeguide/plugins/program/freeguide/viewer/MainController.java
index 372bb9f..e441fdc 100644
--- a/src/freeguide/plugins/program/freeguide/viewer/MainController.java
+++ b/src/freeguide/plugins/program/freeguide/viewer/MainController.java
@@ -236,12 +236,6 @@ public class MainController extends BaseModule implements IApplication
applicationFrame = mainFrame;
- // Check the FreeGuide version
- if( !"no".equals( FreeGuide.config.privacyInfo ) )
- {
- new VersionCheckerThread( getApplicationFrame( ) ).start( );
- }
-
//checkForNoData( );
mainFrame.waitForClose( );
diff --git a/src/freeguide/plugins/program/freeguide/wizard/FirstTimeWizard.java b/src/freeguide/plugins/program/freeguide/wizard/FirstTimeWizard.java
index 8ed4f9d..94e7dcf 100644
--- a/src/freeguide/plugins/program/freeguide/wizard/FirstTimeWizard.java
+++ b/src/freeguide/plugins/program/freeguide/wizard/FirstTimeWizard.java
@@ -86,7 +86,6 @@ public class FirstTimeWizard
panels.add( createFirstPanel( upgrade ) );
panels.add( createRegionPanel( ) );
panels.add( createWorkingDirectoryPanel( ) );
- panels.add( createPrivacyPanel( ) );
panels.add( createInstallPanel( ) );
wizardFrame =
--
1.7.0.1
Index: freeguide.spec
===================================================================
RCS file: /cvs/free/rpms/freeguide/devel/freeguide.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- freeguide.spec 11 Dec 2009 17:09:38 -0000 1.2
+++ freeguide.spec 23 Jun 2010 06:19:42 -0000 1.3
@@ -1,5 +1,5 @@
Name: freeguide
-Version: 0.10.12
+Version: 0.11
Release: 1%{?dist}
Summary: A TV Guide
@@ -8,10 +8,8 @@
URL: http://www.artificialworlds.net/freeguide/Main/HomePage
Source0: http://downloads.sourceforge.net/freeguide-tv/freeguide-%{version}.tar.gz
Source1: freeguide.desktop
-# upstream uses jalopy to format sources; we don't have it so patch it away
-Patch0: no-jalopy-retroweaver.patch
# completely disable the automatic check for updates
-Patch1: disable-check-for-updates.patch
+Patch0: 0001-disable-check-for-updates.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -23,14 +21,14 @@
Requires: java >= 1:1.6.0
Requires: jpackage-utils
-Requires: xmltv-gui
+Requires: xmltv xmltv-gui
%description
FreeGuide is a TV guide program. It uses parser programs to extract TV
information from web pages and stores them for viewing without the need to
connect to the Internet. The viewer allows the user to view television listings
-and create customised TV guides by selecting programmes and by building up a
-favourites list.
+and create customized TV guides by selecting programs and by building up a
+favorites list.
It works with listings for many countries. Check the web site
freeguide-tv.sf.net for details.
@@ -39,14 +37,13 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
find . -name '*.jar' -exec rm -f '{}' \;
rm -rf xmltv
%build
-ant jars-lin
+ant jar
%install
@@ -56,7 +53,7 @@
-Dinstall_doc_dir=%{buildroot}/%{_defaultdocdir}/%{name}-%{version} \
-Dinstall_real_dir=%{_datadir}/freeguide \
-Dinstall_real_doc_dir=%{_defaultdocdir}/%{name}-%{version} \
- install-linux
+ install
install -d -m 0755 %{buildroot}%{_javadir}/%{name}
for jar in $(find %{buildroot}%{_datadir}/%{name} -type f -name '*.jar'); do
@@ -64,7 +61,7 @@
ln -s %{_javadir}/%{name}/$(basename ${jar}) ${jar}
done
-rm -f %{buildroot}%{_datadir}/%{name}/lib/docs.zip
+rm -rf %{buildroot}%{_defaultdocdir}/%{name}
desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \
@@ -76,7 +73,7 @@
%files
%defattr(0644,root,root,0755)
-%doc doc/COPYING doc/html-local/*
+%doc doc/COPYING doc-bin/*
%attr(0755,root,root) %{_bindir}/%{name}
%{_mandir}/man1/%{name}.*
%{_javadir}/%{name}
@@ -86,6 +83,12 @@
%changelog
+* Wed Jun 23 2010 Iain Arnell <iarnell(a)gmail.com> 0.11-1
+- update to latest upstream version
+- remove no-jalopy-retroweaver patch
+- rebase disable-check-for-updates patch
+- Americanize spelling in description
+
* Fri Dec 11 2009 Iain Arnell <iarnell(a)gmail.com> 0.10.12-1
- update to latest upstream version
--- disable-check-for-updates.patch DELETED ---
--- no-jalopy-retroweaver.patch DELETED ---
14 years, 5 months