rpms/audacity-freeworld/F-17 .cvsignore, 1.11, 1.12 audacity-freeworld.spec, 1.23, 1.24 sources, 1.11, 1.12
by David Timms
Author: dtimms
Update of /cvs/free/rpms/audacity-freeworld/F-17
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19967
Modified Files:
.cvsignore audacity-freeworld.spec sources
Log Message:
update to 2.0.0 release candidate 8 for testing only
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-17/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 18 Feb 2012 23:23:18 -0000 1.11
+++ .cvsignore 6 Mar 2012 11:12:40 -0000 1.12
@@ -1 +1 @@
-audacity-minsrc-2.0.0-rc1-20120218.tar.bz2
+audacity-minsrc-2.0.0rc8.tar.bz2
Index: audacity-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-17/audacity-freeworld.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- audacity-freeworld.spec 2 Mar 2012 14:35:36 -0000 1.23
+++ audacity-freeworld.spec 6 Mar 2012 11:12:40 -0000 1.24
@@ -4,7 +4,7 @@
Name: audacity-freeworld
Version: 2.0.0
-Release: 0.3.rc1.20120218svn11513%{?dist}
+Release: 0.8.rc8%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
License: GPLv2
@@ -15,12 +15,12 @@
# use for upstream source releases:
#Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%#{version}-...
-#Source0: http://audacity.googlecode.com/files/audacity-minsrc-1.3.14-beta.tar.bz2
-#%#define tartopdir audacity-src-%#{version}-beta
+Source0: http://audacity.googlecode.com/files/audacity-minsrc-%{version}rc8.tar.bz2
+%define tartopdir audacity-src-%{version}
# use for svn snapshot: [see package README for generation process]
-Source0: audacity-minsrc-2.0.0-rc1-20120218.tar.bz2
-%define tartopdir audacity-src-%{version}
+#S#ource0: audacity-minsrc-2.0.0-rc1-20120218.tar.bz2
+#%#define tartopdir audacity-src-%{version}
Patch1: audacity-1.3.7-libmp3lame-default.patch
Patch2: audacity-1.3.9-libdir.patch
@@ -162,6 +162,9 @@
%changelog
+* Tue Mar 6 2012 David Timms <iinet.net.au@dtimms> - 2.0.0-0.8.rc8
+- update to 2.0.0 release candidate 8 for testing only
+
* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.0-0.3.rc1.20120218svn11513
- Rebuilt for c++ ABI breakage
Index: sources
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-17/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 18 Feb 2012 23:23:18 -0000 1.11
+++ sources 6 Mar 2012 11:12:40 -0000 1.12
@@ -1 +1 @@
-b96bdfe814bf3eb9c432350d575f9349 audacity-minsrc-2.0.0-rc1-20120218.tar.bz2
+68404e82237b0f5d6b5ef5259f14d44f audacity-minsrc-2.0.0rc8.tar.bz2
12 years, 8 months
rpms/audacity-freeworld/devel .cvsignore, 1.11, 1.12 audacity-freeworld.spec, 1.22, 1.23 sources, 1.11, 1.12
by David Timms
Author: dtimms
Update of /cvs/free/rpms/audacity-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19448
Modified Files:
.cvsignore audacity-freeworld.spec sources
Log Message:
update to 2.0.0 release candidate 8 for testing only
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 22 Feb 2012 12:04:58 -0000 1.11
+++ .cvsignore 6 Mar 2012 11:10:19 -0000 1.12
@@ -1 +1 @@
-audacity-minsrc-2.0.0rc3.tar.bz2
+audacity-minsrc-2.0.0rc8.tar.bz2
Index: audacity-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/devel/audacity-freeworld.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- audacity-freeworld.spec 22 Feb 2012 12:04:58 -0000 1.22
+++ audacity-freeworld.spec 6 Mar 2012 11:10:19 -0000 1.23
@@ -4,7 +4,7 @@
Name: audacity-freeworld
Version: 2.0.0
-Release: 0.3.rc3%{?dist}
+Release: 0.8.rc8%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
License: GPLv2
@@ -15,7 +15,7 @@
# use for upstream source releases:
#Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%#{version}-...
-Source0: http://audacity.googlecode.com/files/audacity-minsrc-%{version}rc3.tar.bz2
+Source0: http://audacity.googlecode.com/files/audacity-minsrc-%{version}rc8.tar.bz2
%define tartopdir audacity-src-%{version}
# use for svn snapshot: [see package README for generation process]
@@ -162,6 +162,9 @@
%changelog
+* Tue Mar 6 2012 David Timms <iinet.net.au@dtimms> - 2.0.0-0.8.rc8
+- update to 2.0.0 release candidate 8 for testing only
+
* Wed Feb 22 2012 David Timms <iinet.net.au@dtimms> - 2.0.0-0.3.rc3
- update to 2.0.0 release candidate 3
Index: sources
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 22 Feb 2012 12:04:58 -0000 1.11
+++ sources 6 Mar 2012 11:10:19 -0000 1.12
@@ -1 +1 @@
-6c470126d1385888c22869b5341adfbf audacity-minsrc-2.0.0rc3.tar.bz2
+68404e82237b0f5d6b5ef5259f14d44f audacity-minsrc-2.0.0rc8.tar.bz2
12 years, 8 months
rpms/akmods/F-17 akmods.1, NONE, 1.1 akmods, 1.9, 1.10 akmods.spec, 1.12, 1.13 akmodsbuild, 1.2, 1.3 akmodsbuild.1, 1.2, 1.3 akmodsinit, 1.1, NONE
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/akmods/F-17
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28088
Modified Files:
akmods akmods.spec akmodsbuild akmodsbuild.1
Added Files:
akmods.1
Removed Files:
akmodsinit
Log Message:
* Mon Mar 05 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.4.0-2
- Remove remaining references to previous Fedora releases
- Remove legacy SysV init script from CVS.
- Added man page for akmods and cleaned up man page for akmodsbuild.
--- NEW FILE akmods.1 ---
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.6.
.TH AKMODS "1" "March 2012" "akmods 0.4.0" "User Commands"
.SH NAME
akmods \- manual page for akmods 0.4.0
.SH SYNOPSIS
.B akmods
[\fIOPTIONS\fR]
.SH DESCRIPTION
Checks the akmod packages and rebuilds them if needed
.SS "Available options:"
.HP
\fB\-\-force\fR \fB\-\-\fR try all, even if they failed earlier
.HP
\fB\-\-kernels\fR <kernel> \fB\-\-\fR build and install only for kernel <kernel>
.HP
\fB\-\-akmod\fR <akmod> \fB\-\-\fR build and install only akmod <akmod>
.SH BUGS
https://bugzilla.rpmfusion.org/buglist.cgi?product=Fedora&component=akmod...
.SH AUTHOR
Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info>
.SH MAINTAINER
Richard Shaw <hobbes1069 [AT] gmail [DOT] com>
Index: akmods
===================================================================
RCS file: /cvs/free/rpms/akmods/F-17/akmods,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- akmods 7 Feb 2012 12:52:51 -0000 1.9
+++ akmods 5 Mar 2012 15:27:59 -0000 1.10
@@ -36,7 +36,7 @@
# global vars
myprog="akmods"
-myver="0.3.8"
+myver="0.4.0"
kmodlogfile=
continue_line=""
tmpdir=
Index: akmods.spec
===================================================================
RCS file: /cvs/free/rpms/akmods/F-17/akmods.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- akmods.spec 7 Feb 2012 13:04:13 -0000 1.12
+++ akmods.spec 5 Mar 2012 15:27:59 -0000 1.13
@@ -1,19 +1,17 @@
Name: akmods
Version: 0.4.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Automatic kmods build and install tool
Group: System Environment/Kernel
License: MIT
URL: http://rpmfusion.org/Packaging/KernelModules/Akmods
Source0: akmods
-# To be written
-#Source1: akmods.1
+Source1: akmods.1
Source2: akmodsbuild
Source3: akmodsbuild.1
-Source4: akmodsinit
-Source6: akmodsposttrans
-Source7: akmods.service
+Source4: akmods.service
+Source5: akmodsposttrans
BuildArch: noarch
@@ -49,6 +47,7 @@
boot while its background daemon will build them for kernels right
after they were installed.
+
%prep
echo nothing to prep
@@ -60,16 +59,12 @@
%install
mkdir -p %{buildroot}%{_usrsrc}/akmods/ \
%{buildroot}%{_localstatedir}/cache/akmods/
-install -D -p -m 0755 %{SOURCE0} %{buildroot}%{_sbindir}/akmods
-install -D -p -m 0755 %{SOURCE2} %{buildroot}%{_bindir}/akmodsbuild
-install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_mandir}/man1/akmodsbuild.1
-%if %fedora <= 15
-install -D -p -m 0755 %{SOURCE4} %{buildroot}%{_initrddir}/akmods
-%else
-install -D -p -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/akmods.service
-%endif
-# %%{_sysconfdir}/kernel/posttrans.d/ should be owned my mkinitrd #441111
-install -D -p -m 0755 %{SOURCE6} %{buildroot}/%{_sysconfdir}/kernel/postinst.d/akmods
+install -D -pm 0755 %{SOURCE0} %{buildroot}%{_sbindir}/akmods
+install -D -pm 0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/akmods.1
+install -D -pm 0755 %{SOURCE2} %{buildroot}%{_bindir}/akmodsbuild
+install -D -pm 0644 %{SOURCE3} %{buildroot}%{_mandir}/man1/akmodsbuild.1
+install -D -pm 0644 %{SOURCE4} %{buildroot}%{_unitdir}/akmods.service
+install -D -pm 0755 %{SOURCE5} %{buildroot}%{_sysconfdir}/kernel/postinst.d/akmods
%pre
@@ -95,16 +90,21 @@
%files
-%{_usrsrc}/akmods
-%attr(-,akmods,akmods) %{_localstatedir}/cache/akmods
%{_bindir}/akmodsbuild
%{_sbindir}/akmods
-%{_unitdir}/akmods.service
%{_sysconfdir}/kernel/postinst.d/akmods
+%{_unitdir}/akmods.service
+%{_usrsrc}/akmods
+%attr(-,akmods,akmods) %{_localstatedir}/cache/akmods
%{_mandir}/man1/*
%changelog
+* Mon Mar 05 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.4.0-2
+- Remove remaining references to previous Fedora releases
+- Remove legacy SysV init script from CVS.
+- Added man page for akmods and cleaned up man page for akmodsbuild.
+
* Tue Feb 07 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.0-1
- Update for UsrMove support
- Remove unused references to older fedora
Index: akmodsbuild
===================================================================
RCS file: /cvs/free/rpms/akmods/F-17/akmodsbuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- akmodsbuild 7 Feb 2012 12:52:51 -0000 1.2
+++ akmodsbuild 5 Mar 2012 15:27:59 -0000 1.3
@@ -23,7 +23,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
myprog="akmodsbuild"
-myver="0.3.2"
+myver="0.4.0"
# defaults that might get overwritten by user:
kernels="$(uname -r)"
Index: akmodsbuild.1
===================================================================
RCS file: /cvs/free/rpms/akmods/F-17/akmodsbuild.1,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- akmodsbuild.1 29 Sep 2011 23:17:43 -0000 1.2
+++ akmodsbuild.1 5 Mar 2012 15:27:59 -0000 1.3
@@ -1,5 +1,5 @@
." Text automatically generated by txt2man
-.TH akmodsbuild "1" "" ""
+.TH AKMODSBUILD "1" "March 2012" "akmods 0.4.0" "User Commands"
.SH NAME
\fBakmodsbuild \fP- Rebuilds kmod SRPM(s)
.SH SYNOPSIS
--- akmodsinit DELETED ---
12 years, 8 months
rpms/akmods/devel akmods.1,NONE,1.1
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/akmods/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24955
Added Files:
akmods.1
Log Message:
Add akmods man page to CVS.
--- NEW FILE akmods.1 ---
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.6.
.TH AKMODS "1" "March 2012" "akmods 0.4.0" "User Commands"
.SH NAME
akmods \- manual page for akmods 0.4.0
.SH SYNOPSIS
.B akmods
[\fIOPTIONS\fR]
.SH DESCRIPTION
Checks the akmod packages and rebuilds them if needed
.SS "Available options:"
.HP
\fB\-\-force\fR \fB\-\-\fR try all, even if they failed earlier
.HP
\fB\-\-kernels\fR <kernel> \fB\-\-\fR build and install only for kernel <kernel>
.HP
\fB\-\-akmod\fR <akmod> \fB\-\-\fR build and install only akmod <akmod>
.SH BUGS
https://bugzilla.rpmfusion.org/buglist.cgi?product=Fedora&component=akmod...
.SH AUTHOR
Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info>
.SH MAINTAINER
Richard Shaw <hobbes1069 [AT] gmail [DOT] com>
12 years, 8 months
rpms/akmods/devel akmods,1.9,1.10 akmodsbuild,1.2,1.3
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/akmods/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24544
Modified Files:
akmods akmodsbuild
Log Message:
Update version in scripts.
Index: akmods
===================================================================
RCS file: /cvs/free/rpms/akmods/devel/akmods,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- akmods 7 Feb 2012 12:52:51 -0000 1.9
+++ akmods 5 Mar 2012 14:57:17 -0000 1.10
@@ -36,7 +36,7 @@
# global vars
myprog="akmods"
-myver="0.3.8"
+myver="0.4.0"
kmodlogfile=
continue_line=""
tmpdir=
Index: akmodsbuild
===================================================================
RCS file: /cvs/free/rpms/akmods/devel/akmodsbuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- akmodsbuild 7 Feb 2012 12:52:51 -0000 1.2
+++ akmodsbuild 5 Mar 2012 14:57:17 -0000 1.3
@@ -23,7 +23,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
myprog="akmodsbuild"
-myver="0.3.2"
+myver="0.4.0"
# defaults that might get overwritten by user:
kernels="$(uname -r)"
12 years, 8 months
rpms/akmods/devel akmods.spec, 1.12, 1.13 akmodsbuild.1, 1.2, 1.3 akmodsinit, 1.1, NONE
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/akmods/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22908
Modified Files:
akmods.spec akmodsbuild.1
Removed Files:
akmodsinit
Log Message:
* Mon Mar 05 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.4.0-2
- Remove remaining references to previous Fedora releases
- Remove legacy SysV init script from CVS.
- Added man page for akmods and cleaned up man page for akmodsbuild.
Index: akmods.spec
===================================================================
RCS file: /cvs/free/rpms/akmods/devel/akmods.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- akmods.spec 7 Feb 2012 13:04:13 -0000 1.12
+++ akmods.spec 5 Mar 2012 14:42:09 -0000 1.13
@@ -1,19 +1,17 @@
Name: akmods
Version: 0.4.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Automatic kmods build and install tool
Group: System Environment/Kernel
License: MIT
URL: http://rpmfusion.org/Packaging/KernelModules/Akmods
Source0: akmods
-# To be written
-#Source1: akmods.1
+Source1: akmods.1
Source2: akmodsbuild
Source3: akmodsbuild.1
-Source4: akmodsinit
-Source6: akmodsposttrans
-Source7: akmods.service
+Source4: akmods.service
+Source5: akmodsposttrans
BuildArch: noarch
@@ -49,6 +47,7 @@
boot while its background daemon will build them for kernels right
after they were installed.
+
%prep
echo nothing to prep
@@ -60,16 +59,12 @@
%install
mkdir -p %{buildroot}%{_usrsrc}/akmods/ \
%{buildroot}%{_localstatedir}/cache/akmods/
-install -D -p -m 0755 %{SOURCE0} %{buildroot}%{_sbindir}/akmods
-install -D -p -m 0755 %{SOURCE2} %{buildroot}%{_bindir}/akmodsbuild
-install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_mandir}/man1/akmodsbuild.1
-%if %fedora <= 15
-install -D -p -m 0755 %{SOURCE4} %{buildroot}%{_initrddir}/akmods
-%else
-install -D -p -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/akmods.service
-%endif
-# %%{_sysconfdir}/kernel/posttrans.d/ should be owned my mkinitrd #441111
-install -D -p -m 0755 %{SOURCE6} %{buildroot}/%{_sysconfdir}/kernel/postinst.d/akmods
+install -D -pm 0755 %{SOURCE0} %{buildroot}%{_sbindir}/akmods
+install -D -pm 0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/akmods.1
+install -D -pm 0755 %{SOURCE2} %{buildroot}%{_bindir}/akmodsbuild
+install -D -pm 0644 %{SOURCE3} %{buildroot}%{_mandir}/man1/akmodsbuild.1
+install -D -pm 0644 %{SOURCE4} %{buildroot}%{_unitdir}/akmods.service
+install -D -pm 0755 %{SOURCE5} %{buildroot}%{_sysconfdir}/kernel/postinst.d/akmods
%pre
@@ -95,16 +90,21 @@
%files
-%{_usrsrc}/akmods
-%attr(-,akmods,akmods) %{_localstatedir}/cache/akmods
%{_bindir}/akmodsbuild
%{_sbindir}/akmods
-%{_unitdir}/akmods.service
%{_sysconfdir}/kernel/postinst.d/akmods
+%{_unitdir}/akmods.service
+%{_usrsrc}/akmods
+%attr(-,akmods,akmods) %{_localstatedir}/cache/akmods
%{_mandir}/man1/*
%changelog
+* Mon Mar 05 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.4.0-2
+- Remove remaining references to previous Fedora releases
+- Remove legacy SysV init script from CVS.
+- Added man page for akmods and cleaned up man page for akmodsbuild.
+
* Tue Feb 07 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.0-1
- Update for UsrMove support
- Remove unused references to older fedora
Index: akmodsbuild.1
===================================================================
RCS file: /cvs/free/rpms/akmods/devel/akmodsbuild.1,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- akmodsbuild.1 29 Sep 2011 23:17:43 -0000 1.2
+++ akmodsbuild.1 5 Mar 2012 14:42:09 -0000 1.3
@@ -1,5 +1,5 @@
." Text automatically generated by txt2man
-.TH akmodsbuild "1" "" ""
+.TH AKMODSBUILD "1" "March 2012" "akmods 0.4.0" "User Commands"
.SH NAME
\fBakmodsbuild \fP- Rebuilds kmod SRPM(s)
.SH SYNOPSIS
--- akmodsinit DELETED ---
12 years, 8 months
rpms/mythtv/F-15 mythtv.spec,1.86,1.87
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18212
Modified Files:
mythtv.spec
Log Message:
* Fri Mar 03 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.24.2-2
- Remove transcode as build requirement.
- Misc. spec file cleanup.
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-15/mythtv.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- mythtv.spec 10 Feb 2012 16:41:09 -0000 1.86
+++ mythtv.spec 5 Mar 2012 14:05:40 -0000 1.87
@@ -92,7 +92,7 @@
Release: 0.1.git.%{_gitrev}%{?dist}
#Release: 0.1.rc1%{?dist}
%else
-Release: 1%{?dist}
+Release: 2%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -112,7 +112,13 @@
# The following options are enabled by default. Use --without to disable them
%define with_vdpau %{?_without_vdpau: 0} %{?!_without_vdpau: 1}
+
+%if 0%{?rhel}
+%define with_crystalhd %{?_without_crystalhd: 1} %{?!_without_crystalhd: 0}
+%else
%define with_crystalhd %{?_without_crystalhd: 0} %{?!_without_crystalhd: 1}
+%endif
+
%define with_xvmc %{?_without_xvmc: 0} %{?!_without_xvmc: 1}
%define with_perl %{?_without_perl: 0} %{!?_without_perl: 1}
%define with_python %{?_without_python: 0} %{!?_without_python: 1}
@@ -139,8 +145,6 @@
################################################################################
-#Source0: mythtv-%{version}.tar.bz2
-#Source1: mythplugins-%{version}.tar.bz2
Source0: MythTV-%{name}-v%{version}-0-%{githash1}.tar.gz
Source1: MythTV-mythweb-v%{version}-0-%{githash3}.tar.gz
Patch0: mythtv-%{version}-fixes.patch
@@ -160,15 +164,14 @@
Source111: 99-mythbackend.rules
Source401: mythweb.conf
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
################################################################################
# Python setup
-%if %{with_python}
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]')}
-%endif
+#%if %{with_python}
+#%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+#%{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]')}
+#%endif
################################################################################
@@ -236,7 +239,8 @@
BuildRequires: libvorbis-devel >= 1.0
BuildRequires: mjpegtools-devel >= 1.6.1
BuildRequires: taglib-devel >= 1.5
-BuildRequires: transcode >= 0.6.8
+# Is transcode really a BR?
+#BuildRequires: transcode >= 0.6.8
BuildRequires: x264-devel
BuildRequires: xvidcore-devel >= 0.9.1
@@ -1212,12 +1216,6 @@
# And back to the build/install root
%endif
-################################################################################
-
-%clean
-rm -rf %{buildroot}
-
-################################################################################
%post libs -p /sbin/ldconfig
@@ -1290,10 +1288,8 @@
################################################################################
%files
-%defattr(-,root,root,-)
%files docs
-%defattr(-,root,root,-)
%doc mythtv/README*
%doc mythtv/UPGRADING
%doc mythtv/AUTHORS
@@ -1306,7 +1302,6 @@
%doc mythtv/contrib
%files common
-%defattr(-,root,root,-)
%dir %{_sysconfdir}/mythtv
%dir %{_datadir}/mythtv
%config(noreplace) %{_sysconfdir}/mythtv/mysql.txt
@@ -1316,11 +1311,9 @@
%{_bindir}/mythtranscode
%{_bindir}/mythwikiscripts
%{_datadir}/mythtv/mythconverg*.pl
-%dir %{_datadir}/mythtv/locales
-%{_datadir}/mythtv/locales/*
+%{_datadir}/mythtv/locales/
%files backend
-%defattr(-,root,root,-)
%{_bindir}/mythbackend
%{_bindir}/mythfilldatabase
%{_bindir}/mythjobqueue
@@ -1338,11 +1331,9 @@
%endif
%config(noreplace) %{_sysconfdir}/logrotate.d/mythbackend
%attr(-,mythtv,mythtv) %dir %{_localstatedir}/log/mythtv
-%dir %{_datadir}/mythtv/internetcontent
-%{_datadir}/mythtv/internetcontent/*
+%{_datadir}/mythtv/internetcontent/
%files setup
-%defattr(-,root,root,-)
%{_bindir}/mythtv-setup
%{_bindir}/mythtvsetup
%{_datadir}/mythtv/setup.xml
@@ -1375,20 +1366,15 @@
%{_datadir}/mythtv/i18n/mythfrontend_*.qm
%{_datadir}/applications/*mythfrontend.desktop
%{_datadir}/pixmaps/myth*.png
-%dir %{_datadir}/mythtv/metadata
-%{_datadir}/mythtv/metadata/*
+%{_datadir}/mythtv/metadata/
%files base-themes
-%defattr(-,root,root,-)
-%dir %{_datadir}/mythtv/themes
-%{_datadir}/mythtv/themes/*
+%{_datadir}/mythtv/themes/
%files libs
-%defattr(-,root,root,-)
%{_libdir}/*.so.*
%files devel
-%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%exclude %{_libdir}/*.a
@@ -1397,7 +1383,6 @@
%if %{with_perl}
%files -n perl-MythTV
-%defattr(-,root,root,-)
%{perl_vendorlib}/MythTV.pm
%dir %{perl_vendorlib}/MythTV
%{perl_vendorlib}/MythTV/*.pm
@@ -1409,21 +1394,17 @@
%if %{with_python}
%files -n python-MythTV
-%defattr(-,root,root,-)
-%dir %{python_sitelib}/MythTV/
%{_bindir}/mythpython
-%{python_sitelib}/MythTV/*
+%{python_sitelib}/MythTV/
%{python_sitelib}/MythTV-*.egg-info
%endif
%if %{with_plugins}
%files -n mythplugins
-%defattr(-,root,root,-)
%doc mythplugins/COPYING
%if %{with_mytharchive}
%files -n mytharchive
-%defattr(-,root,root,-)
%doc mythplugins/mytharchive/AUTHORS
%doc mythplugins/mytharchive/COPYING
%doc mythplugins/mytharchive/README
@@ -1438,7 +1419,6 @@
%if %{with_mythbrowser}
%files -n mythbrowser
-%defattr(-,root,root,-)
%doc mythplugins/mythbrowser/AUTHORS
%doc mythplugins/mythbrowser/COPYING
%doc mythplugins/mythbrowser/README
@@ -1448,7 +1428,6 @@
%if %{with_mythgallery}
%files -n mythgallery
-%defattr(-,root,root,-)
%doc mythplugins/mythgallery/AUTHORS
%doc mythplugins/mythgallery/COPYING
%doc mythplugins/mythgallery/README
@@ -1459,7 +1438,6 @@
%if %{with_mythgame}
%files -n mythgame
-%defattr(-,root,root,-)
%dir %{_sysconfdir}/mythgame
%config(noreplace) %{_sysconfdir}/mythgame/gamelist.xml
%{_libdir}/mythtv/plugins/libmythgame.so
@@ -1473,7 +1451,6 @@
%if %{with_mythmusic}
%files -n mythmusic
-%defattr(-,root,root,-)
%doc mythplugins/mythmusic/AUTHORS
%doc mythplugins/mythmusic/COPYING
%doc mythplugins/mythmusic/README
@@ -1486,7 +1463,6 @@
%if %{with_mythnews}
%files -n mythnews
-%defattr(-,root,root,-)
%doc mythplugins/mythnews/AUTHORS
%doc mythplugins/mythnews/COPYING
%doc mythplugins/mythnews/README
@@ -1497,7 +1473,6 @@
%if %{with_mythvideo}
%files -n mythvideo
-%defattr(-,root,root,-)
%doc mythplugins/mythvideo/COPYING
%doc mythplugins/mythvideo/README*
%{_libdir}/mythtv/plugins/libmythvideo.so
@@ -1510,7 +1485,6 @@
%if %{with_mythweather}
%files -n mythweather
-%defattr(-,root,root,-)
%doc mythplugins/mythweather/AUTHORS
%doc mythplugins/mythweather/COPYING
%doc mythplugins/mythweather/README
@@ -1523,18 +1497,15 @@
%if %{with_mythweb}
%files -n mythweb
-%defattr(-,root,root,-)
%doc ../MythTV-mythweb-%{githash4}/README
%doc ../MythTV-mythweb-%{githash4}/LICENSE
%config(noreplace) %{_sysconfdir}/httpd/conf.d/mythweb.conf
%defattr(-,apache,apache,0775)
-%dir %{_datadir}/mythweb
-%{_datadir}/mythweb/*
+%{_datadir}/mythweb/
%endif
%if %{with_mythzoneminder}
%files -n mythzoneminder
-%defattr(-,root,root,-)
%{_libdir}/mythtv/plugins/libmythzoneminder.so
%{_datadir}/mythtv/zonemindermenu.xml
%{_bindir}/mythzmserver
@@ -1543,7 +1514,6 @@
%if %{with_mythnetvision}
%files -n mythnetvision
-%defattr(-,root,root,-)
%doc mythplugins/mythnetvision/AUTHORS
%doc mythplugins/mythnetvision/ChangeLog
%doc mythplugins/mythnetvision/README
@@ -1559,6 +1529,10 @@
################################################################################
%changelog
+* Fri Mar 03 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.24.2-2
+- Remove transcode as build requirement.
+- Misc. spec file cleanup.
+
* Mon Feb 06 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.24.2-1
- Update to latest version.
- Update mythbackend systemd service file for better compatibilty with devices
12 years, 8 months
rpms/mythtv/F-17 mythtv.spec,1.89,1.90
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/F-17
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25822
Modified Files:
mythtv.spec
Log Message:
* Fri Mar 03 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.24.2-2
- Remove transcode as build requirement.
- Misc. spec file cleanup.
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-17/mythtv.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- mythtv.spec 1 Mar 2012 15:53:40 -0000 1.89
+++ mythtv.spec 4 Mar 2012 22:43:15 -0000 1.90
@@ -92,7 +92,7 @@
Release: 0.1.git.%{_gitrev}%{?dist}
#Release: 0.1.rc1%{?dist}
%else
-Release: 1.1%{?dist}
+Release: 2%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -112,7 +112,13 @@
# The following options are enabled by default. Use --without to disable them
%define with_vdpau %{?_without_vdpau: 0} %{?!_without_vdpau: 1}
+
+%if 0%{?rhel}
+%define with_crystalhd %{?_without_crystalhd: 1} %{?!_without_crystalhd: 0}
+%else
%define with_crystalhd %{?_without_crystalhd: 0} %{?!_without_crystalhd: 1}
+%endif
+
%define with_xvmc %{?_without_xvmc: 0} %{?!_without_xvmc: 1}
%define with_perl %{?_without_perl: 0} %{!?_without_perl: 1}
%define with_python %{?_without_python: 0} %{!?_without_python: 1}
@@ -139,11 +145,9 @@
################################################################################
-#Source0: mythtv-%{version}.tar.bz2
-#Source1: mythplugins-%{version}.tar.bz2
Source0: MythTV-%{name}-v%{version}-0-%{githash1}.tar.gz
Source1: MythTV-mythweb-v%{version}-0-%{githash3}.tar.gz
-Patch0: mythtv-0.24.2-fixes.patch
+Patch0: mythtv-%{version}-fixes.patch
#Patch1: mythplugins-%{version}-fixes.patch
Patch2: mythtv-0.24.2-gcc47.patch
@@ -160,15 +164,14 @@
Source111: 99-mythbackend.rules
Source401: mythweb.conf
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
################################################################################
# Python setup
-%if %{with_python}
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]')}
-%endif
+#%if %{with_python}
+#%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+#%{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]')}
+#%endif
################################################################################
@@ -236,7 +239,8 @@
BuildRequires: libvorbis-devel >= 1.0
BuildRequires: mjpegtools-devel >= 1.6.1
BuildRequires: taglib-devel >= 1.5
-BuildRequires: transcode >= 0.6.8
+# Is transcode really a BR?
+#BuildRequires: transcode >= 0.6.8
BuildRequires: x264-devel
BuildRequires: xvidcore-devel >= 0.9.1
@@ -1212,12 +1216,6 @@
# And back to the build/install root
%endif
-################################################################################
-
-%clean
-rm -rf %{buildroot}
-
-################################################################################
%post libs -p /sbin/ldconfig
@@ -1290,10 +1288,8 @@
################################################################################
%files
-%defattr(-,root,root,-)
%files docs
-%defattr(-,root,root,-)
%doc mythtv/README*
%doc mythtv/UPGRADING
%doc mythtv/AUTHORS
@@ -1306,7 +1302,6 @@
%doc mythtv/contrib
%files common
-%defattr(-,root,root,-)
%dir %{_sysconfdir}/mythtv
%dir %{_datadir}/mythtv
%config(noreplace) %{_sysconfdir}/mythtv/mysql.txt
@@ -1316,11 +1311,9 @@
%{_bindir}/mythtranscode
%{_bindir}/mythwikiscripts
%{_datadir}/mythtv/mythconverg*.pl
-%dir %{_datadir}/mythtv/locales
-%{_datadir}/mythtv/locales/*
+%{_datadir}/mythtv/locales/
%files backend
-%defattr(-,root,root,-)
%{_bindir}/mythbackend
%{_bindir}/mythfilldatabase
%{_bindir}/mythjobqueue
@@ -1338,11 +1331,9 @@
%endif
%config(noreplace) %{_sysconfdir}/logrotate.d/mythbackend
%attr(-,mythtv,mythtv) %dir %{_localstatedir}/log/mythtv
-%dir %{_datadir}/mythtv/internetcontent
-%{_datadir}/mythtv/internetcontent/*
+%{_datadir}/mythtv/internetcontent/
%files setup
-%defattr(-,root,root,-)
%{_bindir}/mythtv-setup
%{_bindir}/mythtvsetup
%{_datadir}/mythtv/setup.xml
@@ -1375,20 +1366,15 @@
%{_datadir}/mythtv/i18n/mythfrontend_*.qm
%{_datadir}/applications/*mythfrontend.desktop
%{_datadir}/pixmaps/myth*.png
-%dir %{_datadir}/mythtv/metadata
-%{_datadir}/mythtv/metadata/*
+%{_datadir}/mythtv/metadata/
%files base-themes
-%defattr(-,root,root,-)
-%dir %{_datadir}/mythtv/themes
-%{_datadir}/mythtv/themes/*
+%{_datadir}/mythtv/themes/
%files libs
-%defattr(-,root,root,-)
%{_libdir}/*.so.*
%files devel
-%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%exclude %{_libdir}/*.a
@@ -1397,7 +1383,6 @@
%if %{with_perl}
%files -n perl-MythTV
-%defattr(-,root,root,-)
%{perl_vendorlib}/MythTV.pm
%dir %{perl_vendorlib}/MythTV
%{perl_vendorlib}/MythTV/*.pm
@@ -1409,21 +1394,17 @@
%if %{with_python}
%files -n python-MythTV
-%defattr(-,root,root,-)
-%dir %{python_sitelib}/MythTV/
%{_bindir}/mythpython
-%{python_sitelib}/MythTV/*
+%{python_sitelib}/MythTV/
%{python_sitelib}/MythTV-*.egg-info
%endif
%if %{with_plugins}
%files -n mythplugins
-%defattr(-,root,root,-)
%doc mythplugins/COPYING
%if %{with_mytharchive}
%files -n mytharchive
-%defattr(-,root,root,-)
%doc mythplugins/mytharchive/AUTHORS
%doc mythplugins/mytharchive/COPYING
%doc mythplugins/mytharchive/README
@@ -1438,7 +1419,6 @@
%if %{with_mythbrowser}
%files -n mythbrowser
-%defattr(-,root,root,-)
%doc mythplugins/mythbrowser/AUTHORS
%doc mythplugins/mythbrowser/COPYING
%doc mythplugins/mythbrowser/README
@@ -1448,7 +1428,6 @@
%if %{with_mythgallery}
%files -n mythgallery
-%defattr(-,root,root,-)
%doc mythplugins/mythgallery/AUTHORS
%doc mythplugins/mythgallery/COPYING
%doc mythplugins/mythgallery/README
@@ -1459,7 +1438,6 @@
%if %{with_mythgame}
%files -n mythgame
-%defattr(-,root,root,-)
%dir %{_sysconfdir}/mythgame
%config(noreplace) %{_sysconfdir}/mythgame/gamelist.xml
%{_libdir}/mythtv/plugins/libmythgame.so
@@ -1473,7 +1451,6 @@
%if %{with_mythmusic}
%files -n mythmusic
-%defattr(-,root,root,-)
%doc mythplugins/mythmusic/AUTHORS
%doc mythplugins/mythmusic/COPYING
%doc mythplugins/mythmusic/README
@@ -1486,7 +1463,6 @@
%if %{with_mythnews}
%files -n mythnews
-%defattr(-,root,root,-)
%doc mythplugins/mythnews/AUTHORS
%doc mythplugins/mythnews/COPYING
%doc mythplugins/mythnews/README
@@ -1497,7 +1473,6 @@
%if %{with_mythvideo}
%files -n mythvideo
-%defattr(-,root,root,-)
%doc mythplugins/mythvideo/COPYING
%doc mythplugins/mythvideo/README*
%{_libdir}/mythtv/plugins/libmythvideo.so
@@ -1510,7 +1485,6 @@
%if %{with_mythweather}
%files -n mythweather
-%defattr(-,root,root,-)
%doc mythplugins/mythweather/AUTHORS
%doc mythplugins/mythweather/COPYING
%doc mythplugins/mythweather/README
@@ -1523,18 +1497,15 @@
%if %{with_mythweb}
%files -n mythweb
-%defattr(-,root,root,-)
%doc ../MythTV-mythweb-%{githash4}/README
%doc ../MythTV-mythweb-%{githash4}/LICENSE
%config(noreplace) %{_sysconfdir}/httpd/conf.d/mythweb.conf
%defattr(-,apache,apache,0775)
-%dir %{_datadir}/mythweb
-%{_datadir}/mythweb/*
+%{_datadir}/mythweb/
%endif
%if %{with_mythzoneminder}
%files -n mythzoneminder
-%defattr(-,root,root,-)
%{_libdir}/mythtv/plugins/libmythzoneminder.so
%{_datadir}/mythtv/zonemindermenu.xml
%{_bindir}/mythzmserver
@@ -1543,7 +1514,6 @@
%if %{with_mythnetvision}
%files -n mythnetvision
-%defattr(-,root,root,-)
%doc mythplugins/mythnetvision/AUTHORS
%doc mythplugins/mythnetvision/ChangeLog
%doc mythplugins/mythnetvision/README
@@ -1559,7 +1529,11 @@
################################################################################
%changelog
-* Mon Feb 06 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.24.2-1.1
+* Fri Mar 03 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.24.2-2
+- Remove transcode as build requirement.
+- Misc. spec file cleanup.
+
+* Mon Feb 06 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.24.2-1
- Update to latest version.
- Update mythbackend systemd service file for better compatibilty with devices
that take time to initialize due to firmware loading.
12 years, 8 months
rpms/thunderbird-enigmail/F-15 .cvsignore, 1.13, 1.14 sources, 1.16, 1.17 thunderbird-enigmail.spec, 1.16, 1.17 xulrunner-10.0-gcc47.patch, 1.1, 1.2 enigmail-fixlang.php, 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-serv5040
Modified Files:
.cvsignore sources thunderbird-enigmail.spec
xulrunner-10.0-gcc47.patch
Removed Files:
enigmail-fixlang.php
Log Message:
Enigmail 1.4 for Thunderbird 10.0
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-15/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 31 Jan 2012 22:05:50 -0000 1.13
+++ .cvsignore 4 Mar 2012 06:30:22 -0000 1.14
@@ -1,2 +1,2 @@
thunderbird-10.0.source.tar.bz2
-enigmail-1.3.5.tar.gz
+enigmail-1.4.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-15/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 31 Jan 2012 22:05:50 -0000 1.16
+++ sources 4 Mar 2012 06:30:22 -0000 1.17
@@ -1,2 +1,2 @@
6f76f25894ba746a2e33614d3dd8dbab thunderbird-10.0.source.tar.bz2
-1b008b0d106e238c11e4bead08126bc0 enigmail-1.3.5.tar.gz
+5cf3d9720ed1cda1b22eabe5457772c2 enigmail-1.4.tar.gz
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-15/thunderbird-enigmail.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- thunderbird-enigmail.spec 31 Jan 2012 22:05:50 -0000 1.16
+++ thunderbird-enigmail.spec 4 Mar 2012 06:30:22 -0000 1.17
@@ -32,7 +32,7 @@
Summary: Authentication and encryption extension for Mozilla Thunderbird
Name: thunderbird-enigmail
-Version: 1.3.5
+Version: 1.4
%if 0%{?prever:1}
Release: 0.1.%{prever}%{?dist}
%else
@@ -57,9 +57,6 @@
Source100: http://www.mozilla-enigmail.org/download/source/enigmail-%{version}%{?pre...
%endif
-# http://www.mozdev.org/pipermail/enigmail/2009-April/011018.html
-Source101: enigmail-fixlang.php
-
# Mozilla (XULRunner) patches
Patch0: thunderbird-install-dir.patch
@@ -117,7 +114,7 @@
BuildRequires: GConf2-devel
## For fixing lang
-BuildRequires: dos2unix, php-cli
+BuildRequires: perl
# Without this enigmmail will require libxpcom.so and other .so
@@ -206,9 +203,7 @@
pushd mailnews/extensions/enigmail
for rep in $(cat lang/current-languages.txt)
do
- dos2unix lang/$rep/enigmail.dtd
- dos2unix lang/$rep/enigmail.properties
- php %{SOURCE101} ui/locale/en-US lang/$rep
+ perl util/fixlang.pl ui/locale/en-US lang/$rep
done
popd
@@ -259,16 +254,16 @@
%install
cd %{tarballdir}
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
-%{__mkdir_p} $RPM_BUILD_ROOT%{enigmail_extname}
+mkdir -p $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
+unzip -q mozilla/dist/bin/enigmail-*-linux-*.xpi -d $RPM_BUILD_ROOT%{enigmail_extname}
+chmod +x $RPM_BUILD_ROOT%{enigmail_extname}/wrappers/*.sh
%clean
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
%files
@@ -279,10 +274,14 @@
#===============================================================================
%changelog
+* Sat Mar 03 2012 Remi Collet <remi(a)fedoraproject.org> 1.4-1
+- Enigmail 1.4 for Thunderbird 10.0
+- using upstream fixlang.pl instead of our fixlang.php
+
* Tue Jan 31 2012 Remi Collet <remi(a)fedoraproject.org> 1.3.5-1
- Enigmail 1.3.5 for Thunderbird 10.0
-* Wed Dec 21 2011 Remi Collet <remi(a)fedoraproject.org> 1.3.4-1
+* Wed Dec 21 2011 Remi Collet <remi(a)fedoraproject.org> 1.3.4-1.1
- Enigmail 1.3.4 for Thunderbird 9.0
* Sat Nov 12 2011 Remi Collet <remi(a)fedoraproject.org> 1.3.3-1
xulrunner-10.0-gcc47.patch:
ipc/chromium/src/base/file_util.cc | 2 +-
ipc/chromium/src/base/file_util_linux.cc | 3 +++
ipc/chromium/src/base/message_pump_libevent.cc | 3 +++
ipc/chromium/src/base/time_posix.cc | 2 ++
toolkit/crashreporter/client/Makefile.in | 3 +++
5 files changed, 12 insertions(+), 1 deletion(-)
Index: xulrunner-10.0-gcc47.patch
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-15/xulrunner-10.0-gcc47.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xulrunner-10.0-gcc47.patch 31 Jan 2012 22:05:50 -0000 1.1
+++ xulrunner-10.0-gcc47.patch 4 Mar 2012 06:30:22 -0000 1.2
@@ -23,3 +23,41 @@
ifeq ($(OS_ARCH),WINNT)
CPPSRCS += crashreporter_win.cpp
LIBS += \
+diff -up mozilla-beta/ipc/chromium/src/base/file_util_linux.cc.file mozilla-beta/ipc/chromium/src/base/file_util_linux.cc
+--- mozilla-beta/ipc/chromium/src/base/file_util_linux.cc.file 2012-01-24 09:00:00.000000000 +0100
++++ mozilla-beta/ipc/chromium/src/base/file_util_linux.cc 2012-01-25 15:30:43.707796295 +0100
+@@ -5,6 +5,9 @@
+ #include "base/file_util.h"
+
+ #include <fcntl.h>
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+
+ #include <string>
+ #include <vector>
+diff -up mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc.file mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc
+--- mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc.file 2012-01-24 09:00:00.000000000 +0100
++++ mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc 2012-01-25 15:13:11.947771212 +0100
+@@ -6,6 +6,9 @@
+
+ #include <errno.h>
+ #include <fcntl.h>
++#if defined(ANDROID) || defined(OS_POSIX)
++#include <unistd.h>
++#endif
+
+ #include "eintr_wrapper.h"
+ #include "base/logging.h"
+diff -up mozilla-beta/ipc/chromium/src/base/file_util.cc.old mozilla-beta/ipc/chromium/src/base/file_util.cc
+--- mozilla-beta/ipc/chromium/src/base/file_util.cc.old 2012-01-25 13:48:11.000000000 +0100
++++ mozilla-beta/ipc/chromium/src/base/file_util.cc 2012-01-25 13:52:25.096659244 +0100
+@@ -8,7 +8,7 @@
+ #include <io.h>
+ #endif
+ #include <stdio.h>
+-#if defined(ANDROID)
++#if defined(ANDROID) || defined(OS_POSIX)
+ #include <unistd.h>
+ #endif
+
--- enigmail-fixlang.php DELETED ---
12 years, 8 months
rpms/thunderbird-enigmail/F-17 xulrunner-10.0-gcc47.patch, NONE, 1.1 xulrunner-10.0-secondary-ipc.patch, NONE, 1.1 xulrunner-9.0-secondary-build-fix.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 sources, 1.15, 1.16 thunderbird-enigmail.spec, 1.17, 1.18 enigmail-fixlang.php, 1.1, NONE mozilla-670719.patch, 1.1, NONE mozilla-696393.patch, 1.1, NONE xulrunner-2.0-NetworkManager09.patch, 1.1, NONE xulrunner-2.0-network-link-service.patch, 1.1, NONE xulrunner-9.0-secondary-ipc.patch, 1.1, NONE
by Remi Collet
Author: remi
Update of /cvs/free/rpms/thunderbird-enigmail/F-17
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15291
Modified Files:
.cvsignore sources thunderbird-enigmail.spec
Added Files:
xulrunner-10.0-gcc47.patch xulrunner-10.0-secondary-ipc.patch
xulrunner-9.0-secondary-build-fix.patch
Removed Files:
enigmail-fixlang.php mozilla-670719.patch mozilla-696393.patch
xulrunner-2.0-NetworkManager09.patch
xulrunner-2.0-network-link-service.patch
xulrunner-9.0-secondary-ipc.patch
Log Message:
Enigmail 1.4 for Thunderbird 10.0
xulrunner-10.0-gcc47.patch:
ipc/chromium/src/base/file_util.cc | 2 +-
ipc/chromium/src/base/file_util_linux.cc | 3 +++
ipc/chromium/src/base/message_pump_libevent.cc | 3 +++
ipc/chromium/src/base/time_posix.cc | 2 ++
toolkit/crashreporter/client/Makefile.in | 3 +++
5 files changed, 12 insertions(+), 1 deletion(-)
--- NEW FILE xulrunner-10.0-gcc47.patch ---
diff -up mozilla-beta/ipc/chromium/src/base/time_posix.cc.gcc47 mozilla-beta/ipc/chromium/src/base/time_posix.cc
--- mozilla-beta/ipc/chromium/src/base/time_posix.cc.gcc47 2012-01-24 03:00:00.000000000 -0500
+++ mozilla-beta/ipc/chromium/src/base/time_posix.cc 2012-01-30 14:12:49.198472212 -0500
@@ -14,6 +14,8 @@
#include <time.h>
#endif
+#include <unistd.h>
+
#include <limits>
#include "base/basictypes.h"
diff -up mozilla-beta/toolkit/crashreporter/client/Makefile.in.gcc47 mozilla-beta/toolkit/crashreporter/client/Makefile.in
--- mozilla-beta/toolkit/crashreporter/client/Makefile.in.gcc47 2012-01-30 14:41:14.475441039 -0500
+++ mozilla-beta/toolkit/crashreporter/client/Makefile.in 2012-01-30 14:43:03.587646656 -0500
@@ -69,6 +69,9 @@ CPPSRCS = \
$(STDCXX_COMPAT) \
$(NULL)
+# Needed for moz_free
+LIBS += -L$(LIBXUL_DIST)/lib -lmozalloc
+
ifeq ($(OS_ARCH),WINNT)
CPPSRCS += crashreporter_win.cpp
LIBS += \
diff -up mozilla-beta/ipc/chromium/src/base/file_util_linux.cc.file mozilla-beta/ipc/chromium/src/base/file_util_linux.cc
--- mozilla-beta/ipc/chromium/src/base/file_util_linux.cc.file 2012-01-24 09:00:00.000000000 +0100
+++ mozilla-beta/ipc/chromium/src/base/file_util_linux.cc 2012-01-25 15:30:43.707796295 +0100
@@ -5,6 +5,9 @@
#include "base/file_util.h"
#include <fcntl.h>
+#if defined(ANDROID) || defined(OS_POSIX)
+#include <unistd.h>
+#endif
#include <string>
#include <vector>
diff -up mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc.file mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc
--- mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc.file 2012-01-24 09:00:00.000000000 +0100
+++ mozilla-beta/ipc/chromium/src/base/message_pump_libevent.cc 2012-01-25 15:13:11.947771212 +0100
@@ -6,6 +6,9 @@
#include <errno.h>
#include <fcntl.h>
+#if defined(ANDROID) || defined(OS_POSIX)
+#include <unistd.h>
+#endif
#include "eintr_wrapper.h"
#include "base/logging.h"
diff -up mozilla-beta/ipc/chromium/src/base/file_util.cc.old mozilla-beta/ipc/chromium/src/base/file_util.cc
--- mozilla-beta/ipc/chromium/src/base/file_util.cc.old 2012-01-25 13:48:11.000000000 +0100
+++ mozilla-beta/ipc/chromium/src/base/file_util.cc 2012-01-25 13:52:25.096659244 +0100
@@ -8,7 +8,7 @@
#include <io.h>
#endif
#include <stdio.h>
-#if defined(ANDROID)
+#if defined(ANDROID) || defined(OS_POSIX)
#include <unistd.h>
#endif
xulrunner-10.0-secondary-ipc.patch:
base/data_pack.cc | 9 +--------
build/build_config.h | 4 ++--
2 files changed, 3 insertions(+), 10 deletions(-)
--- NEW FILE xulrunner-10.0-secondary-ipc.patch ---
diff -up thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/base/data_pack.cc.secondary-ipc thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/base/data_pack.cc
--- thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/base/data_pack.cc.secondary-ipc 2012-01-29 15:44:23.000000000 +0100
+++ thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/base/data_pack.cc 2012-01-31 10:45:57.784248018 +0100
@@ -91,14 +91,7 @@ bool DataPack::Load(const FilePath& path
bool DataPack::Get(uint32_t resource_id, StringPiece* data) {
// It won't be hard to make this endian-agnostic, but it's not worth
// bothering to do right now.
-#if defined(__BYTE_ORDER)
- // Linux check
- COMPILE_ASSERT(__BYTE_ORDER == __LITTLE_ENDIAN,
- datapack_assumes_little_endian);
-#elif defined(__BIG_ENDIAN__)
- // Mac check
- #error DataPack assumes little endian
-#endif
+#warning DoTheRightThingMakingThisEndianAgnostic!
DataPackEntry* target = reinterpret_cast<DataPackEntry*>(
bsearch(&resource_id, mmap_->data() + kHeaderLength, resource_count_,
diff -up thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/build/build_config.h.secondary-ipc thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/build/build_config.h
--- thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/build/build_config.h.secondary-ipc 2012-01-29 15:44:23.000000000 +0100
+++ thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/build/build_config.h 2012-01-31 10:53:24.409935119 +0100
@@ -65,10 +65,10 @@
#elif defined(__ppc__) || defined(__powerpc__)
#define ARCH_CPU_PPC 1
#define ARCH_CPU_32_BITS 1
-#elif defined(__sparc64__)
+#elif defined(__sparc__) && !defined(__arch64)
#define ARCH_CPU_SPARC 1
#define ARCH_CPU_64_BITS 1
-#elif defined(__sparc__)
+#elif defined(__sparc__) && defined(__arch64)
#define ARCH_CPU_SPARC 1
#define ARCH_CPU_32_BITS 1
#elif defined(__mips__)
diff -up thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h.secondary-ipc thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h
xulrunner-9.0-secondary-build-fix.patch:
jscompartment.cpp | 1 -
1 file changed, 1 deletion(-)
--- NEW FILE xulrunner-9.0-secondary-build-fix.patch ---
diff -up xulrunner-9.0.1/mozilla-release/js/src/jscompartment.cpp.orig xulrunner-9.0.1/mozilla-release/js/src/jscompartment.cpp
--- xulrunner-9.0.1/mozilla-release/js/src/jscompartment.cpp.orig 2012-01-04 11:06:39.000000000 +0100
+++ xulrunner-9.0.1/mozilla-release/js/src/jscompartment.cpp 2012-01-04 11:06:43.000000000 +0100
@@ -50,7 +50,6 @@
#include "jswatchpoint.h"
#include "jswrapper.h"
#include "assembler/wtf/Platform.h"
-#include "assembler/jit/ExecutableAllocator.h"
#include "yarr/BumpPointerAllocator.h"
#include "methodjit/MethodJIT.h"
#include "methodjit/PolyIC.h"
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-17/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 21 Dec 2011 21:26:06 -0000 1.14
+++ .cvsignore 3 Mar 2012 21:22:21 -0000 1.15
@@ -1,2 +1,2 @@
-enigmail-1.3.4.tar.gz
-thunderbird-9.0.source.tar.bz2
+thunderbird-10.0.source.tar.bz2
+enigmail-1.4.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-17/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 21 Dec 2011 21:26:06 -0000 1.15
+++ sources 3 Mar 2012 21:22:21 -0000 1.16
@@ -1,2 +1,2 @@
-2b5f188791811d248b6ff1fc51a5806a enigmail-1.3.4.tar.gz
-681bdf6362945b59b2bec23f8aecc7e7 thunderbird-9.0.source.tar.bz2
+6f76f25894ba746a2e33614d3dd8dbab thunderbird-10.0.source.tar.bz2
+5cf3d9720ed1cda1b22eabe5457772c2 enigmail-1.4.tar.gz
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-17/thunderbird-enigmail.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- thunderbird-enigmail.spec 21 Dec 2011 21:26:06 -0000 1.17
+++ thunderbird-enigmail.spec 3 Mar 2012 21:22:21 -0000 1.18
@@ -1,4 +1,4 @@
-%define nspr_version 4.8.8
+%define nspr_version 4.8.9
%define nss_version 3.13.1
%define cairo_version 1.10.0
%define freetype_version 2.1.9
@@ -13,7 +13,8 @@
%define system_sqlite 1
%endif
-%global thunver 9.0
+%global thunver 10.0
+%global thunmax 11.0
# The tarball is pretty inconsistent with directory structure.
# Sometimes there is a top level directory. That goes here.
@@ -31,7 +32,7 @@
Summary: Authentication and encryption extension for Mozilla Thunderbird
Name: thunderbird-enigmail
-Version: 1.3.4
+Version: 1.4
%if 0%{?prever:1}
Release: 0.1.%{prever}%{?dist}
%else
@@ -56,19 +57,16 @@
Source100: http://www.mozilla-enigmail.org/download/source/enigmail-%{version}%{?pre...
%endif
-# http://www.mozdev.org/pipermail/enigmail/2009-April/011018.html
-Source101: enigmail-fixlang.php
-
# Mozilla (XULRunner) patches
Patch0: thunderbird-install-dir.patch
Patch7: crashreporter-remove-static.patch
-Patch8: xulrunner-9.0-secondary-ipc.patch
-Patch10: xulrunner-2.0-network-link-service.patch
-Patch11: xulrunner-2.0-NetworkManager09.patch
-Patch12: mozilla-696393.patch
+Patch8: xulrunner-10.0-secondary-ipc.patch
+# # cherry-picked from 13afcd4c097c
+Patch13: xulrunner-9.0-secondary-build-fix.patch
# Build patches
+Patch100: xulrunner-10.0-gcc47.patch
# Linux specific
Patch200: thunderbird-8.0-enable-addons.patch
@@ -116,7 +114,7 @@
BuildRequires: GConf2-devel
## For fixing lang
-BuildRequires: dos2unix, php-cli
+BuildRequires: perl
# Without this enigmmail will require libxpcom.so and other .so
@@ -124,7 +122,9 @@
# because provided by xulrunner).
AutoReq: 0
# All others deps already required by thunderbird
-Requires: gnupg, thunderbird >= %{thunver}
+Requires: gnupg
+Requires: thunderbird >= %{thunver}
+Requires: thunderbird < %{thunmax}
# Nothing usefull provided
AutoProv: 0
@@ -145,10 +145,11 @@
# Mozilla (XULRunner) patches
cd mozilla
%patch7 -p2 -b .static
-%patch8 -p2 -b .secondary-ipc
-%patch10 -p1 -b .link-service
-%patch11 -p1 -b .NetworkManager09
-%patch12 -p2 -b .696393
+%patch8 -p3 -b .secondary-ipc
+%patch13 -p2 -b .secondary-build
+%if 0%{?fedora} >= 17
+%patch100 -p1 -b .gcc47
+%endif
cd ..
%patch200 -p1 -b .addons
@@ -169,6 +170,11 @@
%{__cat} %{SOURCE11} >> .mozconfig
%endif
+# s390(x) fails to start with jemalloc enabled
+%ifarch s390 s390x
+echo "ac_add_options --disable-jemalloc" >> .mozconfig
+%endif
+
%if %{?system_sqlite}
echo "ac_add_options --enable-system-sqlite" >> .mozconfig
%else
@@ -187,7 +193,7 @@
# All tarballs (as well as CVS) will *always* report as 1.4a1pre (or whatever
# the next major version would be). This is because I create builds from trunk
# and simply label the result as 1.3.x.
-sed -i -e '/em:version/s/1.4a1pre/%{version}/' package/install.rdf
+# sed -i -e '/em:version/s/1.4a1pre/%{version}/' package/install.rdf
grep '<em:version>%{version}</em:version>' package/install.rdf || exit 1
# Apply Enigmail patch here
popd
@@ -197,9 +203,7 @@
pushd mailnews/extensions/enigmail
for rep in $(cat lang/current-languages.txt)
do
- dos2unix lang/$rep/enigmail.dtd
- dos2unix lang/$rep/enigmail.properties
- php %{SOURCE101} ui/locale/en-US lang/$rep
+ perl util/fixlang.pl ui/locale/en-US lang/$rep
done
popd
@@ -250,16 +254,16 @@
%install
cd %{tarballdir}
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
-%{__mkdir_p} $RPM_BUILD_ROOT%{enigmail_extname}
+mkdir -p $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
+unzip -q mozilla/dist/bin/enigmail-*-linux-*.xpi -d $RPM_BUILD_ROOT%{enigmail_extname}
+chmod +x $RPM_BUILD_ROOT%{enigmail_extname}/wrappers/*.sh
%clean
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
%files
@@ -270,7 +274,14 @@
#===============================================================================
%changelog
-* Wed Dec 21 2011 Remi Collet <remi(a)fedoraproject.org> 1.3.4-1
+* Sat Mar 03 2012 Remi Collet <remi(a)fedoraproject.org> 1.4-1
+- Enigmail 1.4 for Thunderbird 10.0
+- using upstream fixlang.pl instead of our fixlang.php
+
+* Tue Jan 31 2012 Remi Collet <remi(a)fedoraproject.org> 1.3.5-1
+- Enigmail 1.3.5 for Thunderbird 10.0
+
+* Wed Dec 21 2011 Remi Collet <remi(a)fedoraproject.org> 1.3.4-1.1
- Enigmail 1.3.4 for Thunderbird 9.0
* Sat Nov 12 2011 Remi Collet <remi(a)fedoraproject.org> 1.3.3-1
--- enigmail-fixlang.php DELETED ---
--- mozilla-670719.patch DELETED ---
--- mozilla-696393.patch DELETED ---
--- xulrunner-2.0-NetworkManager09.patch DELETED ---
--- xulrunner-2.0-network-link-service.patch DELETED ---
--- xulrunner-9.0-secondary-ipc.patch DELETED ---
12 years, 8 months