rpms/xorg-x11-drv-psb/F-13 xorg-x11-drv-psb-0.32.0-rotate.patch, NONE, 1.1 xorg-x11-drv-psb.spec, 1.1, 1.2
by Adam Williamson
Author: adamwill
Update of /cvs/nonfree/rpms/xorg-x11-drv-psb/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2191
Modified Files:
xorg-x11-drv-psb.spec
Added Files:
xorg-x11-drv-psb-0.32.0-rotate.patch
Log Message:
* Thu Jul 22 2010 Adam Williamson <adamwill AT shaw DOT ca> - 0.32.0-4
- add rotate.patch, from Yves: fixes 90 degree rotation
xorg-x11-drv-psb-0.32.0-rotate.patch:
psb_crtc.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
--- NEW FILE xorg-x11-drv-psb-0.32.0-rotate.patch ---
--- xserver-xorg-video-psb-0.32.0/src/psb_crtc.c 2009-05-11 18:37:53.000000000 -0700
+++ xserver-xorg-video-psb-0.32.0/src/psb_crtc.c.new 2010-07-22 14:27:54.528657277 -0700
@@ -431,7 +431,9 @@
if (bPlaneBEnabled)
{
//current mode dot clock, HZ
- DotClockB = output->crtc->mode.Clock * 1000 / WM_DOTCLOCK_DIVISOR;
+ if( output->crtc ){
+ DotClockB = output->crtc->mode.Clock * 1000 / WM_DOTCLOCK_DIVISOR;
+ }
BPPB = output->scrn->bitsPerPixel;
}
}
@@ -440,7 +442,9 @@
{
if (bPlaneAEnabled)
{
- DotClockA = output->crtc->mode.Clock * 1000 / WM_DOTCLOCK_DIVISOR;
+ if( output->crtc ){
+ DotClockA = output->crtc->mode.Clock * 1000 / WM_DOTCLOCK_DIVISOR;
+ }
BPPA = output->scrn->bitsPerPixel;
}
}
Index: xorg-x11-drv-psb.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-psb/F-13/xorg-x11-drv-psb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-drv-psb.spec 15 Jul 2010 22:49:19 -0000 1.1
+++ xorg-x11-drv-psb.spec 22 Jul 2010 21:32:56 -0000 1.2
@@ -5,7 +5,7 @@
Summary: Intel GMA500 (Poulsbo) video driver
Name: xorg-x11-drv-psb
Version: 0.32.0
-Release: 3%{?dist}
+Release: 4%{?dist}
URL: http://netbook-remix.archive.canonical.com/updates/pool/public/x/xserver-...
Source0: http://netbook-remix.archive.canonical.com/updates/pool/public/x/xserver-...
# Causes psb module to be loaded when a GMA500 adapter PCI ID is found
@@ -36,6 +36,8 @@
Patch9: xorg-x11-drv-psb-0.32.0-mixed.patch
# From Yves - fix a problem with Xv
Patch10: xorg-x11-drv-psb-0.32.0-xv.patch
+# From Yves - fix blank screen when rotating 90 degrees
+Patch11: xorg-x11-drv-psb-0.32.0-rotate.patch
License: MIT
Group: User Interface/X Hardware Support
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -89,6 +91,7 @@
%patch8 -p1 -b .header
%patch9 -p1 -b .mixed
%patch10 -p1 -b .xv
+%patch11 -p1 -b .rotate
iconv -f iso-8859-15 -t utf-8 -o man/psb.man.utf8 man/psb.man && mv man/psb.man.utf8 man/psb.man
@@ -143,6 +146,9 @@
%{_mandir}/man4/*.4*
%changelog
+* Thu Jul 22 2010 Adam Williamson <adamwill AT shaw DOT ca> - 0.32.0-4
+- add rotate.patch, from Yves: fixes 90 degree rotation
+
* Thu Jul 15 2010 Adam Williamson <adamwill AT shaw DOT ca> - 0.32.0-3
- add patches from Yves de Muyter, Ubuntu community and Eric Piel for
later X compatibility
13 years, 9 months
rpms/psb-kmod/F-13 psb-kmod-4.41.1-2.6.34.patch, NONE, 1.1 psb-kmod.spec, 1.1, 1.2
by Adam Williamson
Author: adamwill
Update of /cvs/nonfree/rpms/psb-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1027
Modified Files:
psb-kmod.spec
Added Files:
psb-kmod-4.41.1-2.6.34.patch
Log Message:
* Thu Jul 22 2010 Adam Williamson <adamwill AT shaw DOT ca> - 4.41.1-12
- add 2.6.34.patch (from Eric Piel, fixes build on 2.6.34)
psb-kmod-4.41.1-2.6.34.patch:
intel_lvds.c | 7 +++++++
1 file changed, 7 insertions(+)
--- NEW FILE psb-kmod-4.41.1-2.6.34.patch ---
--- intel_lvds.c.bak 2010-04-02 00:26:45.489008304 +0200
+++ intel_lvds.c 2010-04-02 00:40:51.530267983 +0200
@@ -801,7 +801,14 @@
if ((blc_type == BLC_I2C_TYPE) || (blc_type == BLC_PWM_TYPE)){
/* add /sys/class/backlight interface as standard */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)
+ struct backlight_properties props;
+ memset(&props, 0, sizeof(struct backlight_properties));
+ props.max_brightness = BRIGHTNESS_MAX_LEVEL;
+ psbbl_device = backlight_device_register("psblvds", &dev->pdev->dev, dev, &psbbl_ops, &props);
+#else
psbbl_device = backlight_device_register("psblvds", &dev->pdev->dev, dev, &psbbl_ops);
+#endif
if (psbbl_device){
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,20)
down(&psbbl_device->sem);
Index: psb-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/psb-kmod/F-13/psb-kmod.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- psb-kmod.spec 15 Jul 2010 20:09:07 -0000 1.1
+++ psb-kmod.spec 22 Jul 2010 21:20:16 -0000 1.2
@@ -7,7 +7,7 @@
Name: psb-kmod
Version: 4.41.1
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Kernel module for Poulsbo graphics chipsets
Group: System Environment/Kernel
@@ -34,6 +34,8 @@
Patch5: psb-kernel-source-4.41.1-i2c-intelfb.patch
# Fix build for 2.6.32 (from Gentoo via Mandriva)
Patch6: psb-kernel-source-4.41.1-2.6.32.patch
+# Fix build for 2.6.34 (Eric Piel: https://patchwork.kernel.org/patch/90678/ )
+Patch7: psb-kmod-4.41.1-2.6.34.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExclusiveArch: i586 i686
@@ -71,6 +73,7 @@
%patch6 -p1 -b .build2632
fi
%patch4 -p1 -b .drmpsb
+%patch7 -p0 -b .build2634
popd
done
@@ -101,6 +104,9 @@
%changelog
+* Thu Jul 22 2010 Adam Williamson <adamwill AT shaw DOT ca> - 4.41.1-12
+- add 2.6.34.patch (from Eric Piel, fixes build on 2.6.34)
+
* Fri May 21 2010 Adam Williamson <adamwill AT shaw DOT ca> - 4.41.1-11
- add 2.6.32.patch (from Gentoo via Mandriva, fixes build on 2.6.32)
13 years, 9 months
rpms/mame/F-12 .cvsignore, 1.8, 1.9 mame.spec, 1.9, 1.10 sources, 1.8, 1.9
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24539
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Thu Jul 22 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.138u4-1
- Updated to 0.138u4
- Install the new manpages
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 8 Jul 2010 18:00:05 -0000 1.8
+++ .cvsignore 22 Jul 2010 19:07:43 -0000 1.9
@@ -2,3 +2,4 @@
0138u1_diff.zip
0138u2_diff.zip
0138u3_diff.zip
+0138u4_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-12/mame.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mame.spec 8 Jul 2010 18:52:51 -0000 1.9
+++ mame.spec 22 Jul 2010 19:07:43 -0000 1.10
@@ -2,7 +2,7 @@
%bcond_with debug
%global baseversion 138
-%global sourceupdate 3
+%global sourceupdate 4
Name: mame
%if 0%{?sourceupdate}
@@ -25,7 +25,7 @@
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
+Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
%endif
Patch0: %{name}-fortify.patch
Patch2: %{name}-verbosebuild.patch
@@ -153,6 +153,7 @@
install -d %{buildroot}%{_datadir}/%{name}/roms
install -d %{buildroot}%{_datadir}/%{name}/samples
install -d %{buildroot}%{_datadir}/%{name}/cheats
+install -d %{buildroot}%{_mandir}/man1
install -d %{buildroot}%{_sysconfdir}/%{name}
install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/cfg
install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/comments
@@ -180,6 +181,10 @@
do
install -pm 755 $tool %{buildroot}%{_bindir}/%{name}-$tool
done
+pushd src/osd/sdl/man
+install -pm 644 chdman.1 jedutil.1 ldverify.1 mame.1 romcmp.1 \
+ testkeys.1 %{buildroot}%{_mandir}/man1
+popd
%clean
@@ -197,6 +202,7 @@
%{_bindir}/%{name}
%endif
%{_datadir}/%{name}
+%{_mandir}/man1/mame.1*
%{_sysconfdir}/skel/.%{name}
%files tools
@@ -213,13 +219,23 @@
%{_bindir}/%{name}-srcclean
%{_bindir}/testkeys
%{_bindir}/unidasm
+%{_mandir}/man1/chdman.1*
+%{_mandir}/man1/jedutil.1*
+%{_mandir}/man1/ldverify.1*
+%{_mandir}/man1/romcmp.1*
+%{_mandir}/man1/testkeys.1*
#%files ldplayer
#%defattr(-,root,root,-)
#%{_bindir}/ldplayer
+#%{_mandir}/man1/ldplayer.1*
%changelog
+* Thu Jul 22 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.138u4-1
+- Updated to 0.138u4
+- Install the new manpages
+
* Thu Jul 08 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.138u3-1
- Updated to 0.138u3
- Updated the verbosebuild patch
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 8 Jul 2010 18:00:05 -0000 1.8
+++ sources 22 Jul 2010 19:07:43 -0000 1.9
@@ -2,3 +2,4 @@
5e6ffa6b1e7016b21984aef654faa04a 0138u1_diff.zip
5889117cc4a665ac0c25bb4a5c0580f9 0138u2_diff.zip
b132cf0a572412c9d3af2b568a78dca4 0138u3_diff.zip
+ffd7ebfdff9cedcc8ec4b39ca2cfd422 0138u4_diff.zip
13 years, 9 months
rpms/mame/F-13 .cvsignore, 1.8, 1.9 mame.spec, 1.8, 1.9 sources, 1.8, 1.9
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24435
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Thu Jul 22 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.138u4-1
- Updated to 0.138u4
- Install the new manpages
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-13/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 8 Jul 2010 17:59:57 -0000 1.8
+++ .cvsignore 22 Jul 2010 19:07:34 -0000 1.9
@@ -2,3 +2,4 @@
0138u1_diff.zip
0138u2_diff.zip
0138u3_diff.zip
+0138u4_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-13/mame.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mame.spec 8 Jul 2010 18:52:47 -0000 1.8
+++ mame.spec 22 Jul 2010 19:07:34 -0000 1.9
@@ -2,7 +2,7 @@
%bcond_with debug
%global baseversion 138
-%global sourceupdate 3
+%global sourceupdate 4
Name: mame
%if 0%{?sourceupdate}
@@ -25,7 +25,7 @@
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
+Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
%endif
Patch0: %{name}-fortify.patch
Patch2: %{name}-verbosebuild.patch
@@ -153,6 +153,7 @@
install -d %{buildroot}%{_datadir}/%{name}/roms
install -d %{buildroot}%{_datadir}/%{name}/samples
install -d %{buildroot}%{_datadir}/%{name}/cheats
+install -d %{buildroot}%{_mandir}/man1
install -d %{buildroot}%{_sysconfdir}/%{name}
install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/cfg
install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/comments
@@ -180,6 +181,10 @@
do
install -pm 755 $tool %{buildroot}%{_bindir}/%{name}-$tool
done
+pushd src/osd/sdl/man
+install -pm 644 chdman.1 jedutil.1 ldverify.1 mame.1 romcmp.1 \
+ testkeys.1 %{buildroot}%{_mandir}/man1
+popd
%clean
@@ -197,6 +202,7 @@
%{_bindir}/%{name}
%endif
%{_datadir}/%{name}
+%{_mandir}/man1/mame.1*
%{_sysconfdir}/skel/.%{name}
%files tools
@@ -213,13 +219,23 @@
%{_bindir}/%{name}-srcclean
%{_bindir}/testkeys
%{_bindir}/unidasm
+%{_mandir}/man1/chdman.1*
+%{_mandir}/man1/jedutil.1*
+%{_mandir}/man1/ldverify.1*
+%{_mandir}/man1/romcmp.1*
+%{_mandir}/man1/testkeys.1*
#%files ldplayer
#%defattr(-,root,root,-)
#%{_bindir}/ldplayer
+#%{_mandir}/man1/ldplayer.1*
%changelog
+* Thu Jul 22 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.138u4-1
+- Updated to 0.138u4
+- Install the new manpages
+
* Thu Jul 08 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.138u3-1
- Updated to 0.138u3
- Updated the verbosebuild patch
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-13/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 8 Jul 2010 17:59:57 -0000 1.8
+++ sources 22 Jul 2010 19:07:34 -0000 1.9
@@ -2,3 +2,4 @@
5e6ffa6b1e7016b21984aef654faa04a 0138u1_diff.zip
5889117cc4a665ac0c25bb4a5c0580f9 0138u2_diff.zip
b132cf0a572412c9d3af2b568a78dca4 0138u3_diff.zip
+ffd7ebfdff9cedcc8ec4b39ca2cfd422 0138u4_diff.zip
13 years, 9 months
rpms/mame/devel .cvsignore, 1.9, 1.10 mame.spec, 1.11, 1.12 sources, 1.9, 1.10
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24331
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Thu Jul 22 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.138u4-1
- Updated to 0.138u4
- Install the new manpages
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 8 Jul 2010 17:59:46 -0000 1.9
+++ .cvsignore 22 Jul 2010 19:07:24 -0000 1.10
@@ -2,3 +2,4 @@
0138u1_diff.zip
0138u2_diff.zip
0138u3_diff.zip
+0138u4_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mame.spec 8 Jul 2010 18:52:42 -0000 1.11
+++ mame.spec 22 Jul 2010 19:07:24 -0000 1.12
@@ -2,7 +2,7 @@
%bcond_with debug
%global baseversion 138
-%global sourceupdate 3
+%global sourceupdate 4
Name: mame
%if 0%{?sourceupdate}
@@ -25,7 +25,7 @@
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
+Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
%endif
Patch0: %{name}-fortify.patch
Patch2: %{name}-verbosebuild.patch
@@ -153,6 +153,7 @@
install -d %{buildroot}%{_datadir}/%{name}/roms
install -d %{buildroot}%{_datadir}/%{name}/samples
install -d %{buildroot}%{_datadir}/%{name}/cheats
+install -d %{buildroot}%{_mandir}/man1
install -d %{buildroot}%{_sysconfdir}/%{name}
install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/cfg
install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/comments
@@ -180,6 +181,10 @@
do
install -pm 755 $tool %{buildroot}%{_bindir}/%{name}-$tool
done
+pushd src/osd/sdl/man
+install -pm 644 chdman.1 jedutil.1 ldverify.1 mame.1 romcmp.1 \
+ testkeys.1 %{buildroot}%{_mandir}/man1
+popd
%clean
@@ -197,6 +202,7 @@
%{_bindir}/%{name}
%endif
%{_datadir}/%{name}
+%{_mandir}/man1/mame.1*
%{_sysconfdir}/skel/.%{name}
%files tools
@@ -213,13 +219,23 @@
%{_bindir}/%{name}-srcclean
%{_bindir}/testkeys
%{_bindir}/unidasm
+%{_mandir}/man1/chdman.1*
+%{_mandir}/man1/jedutil.1*
+%{_mandir}/man1/ldverify.1*
+%{_mandir}/man1/romcmp.1*
+%{_mandir}/man1/testkeys.1*
#%files ldplayer
#%defattr(-,root,root,-)
#%{_bindir}/ldplayer
+#%{_mandir}/man1/ldplayer.1*
%changelog
+* Thu Jul 22 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.138u4-1
+- Updated to 0.138u4
+- Install the new manpages
+
* Thu Jul 08 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.138u3-1
- Updated to 0.138u3
- Updated the verbosebuild patch
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 8 Jul 2010 17:59:46 -0000 1.9
+++ sources 22 Jul 2010 19:07:24 -0000 1.10
@@ -2,3 +2,4 @@
5e6ffa6b1e7016b21984aef654faa04a 0138u1_diff.zip
5889117cc4a665ac0c25bb4a5c0580f9 0138u2_diff.zip
b132cf0a572412c9d3af2b568a78dca4 0138u3_diff.zip
+ffd7ebfdff9cedcc8ec4b39ca2cfd422 0138u4_diff.zip
13 years, 9 months
rpms/thunderbird-enigmail/F-13 enigmail-1.1.2-perm.patch, NONE, 1.1 remove-static.patch, NONE, 1.1 thunderbird-version.patch, NONE, 1.1 xulrunner-1.9.2.1-build.patch, NONE, 1.1 xulrunner-missing-headers.patch, NONE, 1.1 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 mozilla-extension-update.sh, 1.1, NONE 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/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8310
Modified Files:
sources thunderbird-enigmail.spec thunderbird-mozconfig
thunderbird-shared-error.patch
Added Files:
enigmail-1.1.2-perm.patch remove-static.patch
thunderbird-version.patch xulrunner-1.9.2.1-build.patch
xulrunner-missing-headers.patch
Removed Files:
mozilla-extension-update.sh thunderbird-3.0-ppc64.patch
thunderbird-clipboard-crash.patch
Log Message:
update to enigmail 1.1.2 for thunderbird 3.1.1
enigmail-1.1.2-perm.patch:
enigmail.js | 2 --
1 file changed, 2 deletions(-)
--- NEW FILE enigmail-1.1.2-perm.patch ---
diff -up enigmail-1.1.2/package/enigmail.js.perm enigmail-1.1.2/package/enigmail.js
--- enigmail-1.1.2/package/enigmail.js.perm 2010-06-30 19:18:50.000000000 +0200
+++ enigmail-1.1.2/package/enigmail.js 2010-06-30 19:19:22.000000000 +0200
@@ -1231,7 +1231,6 @@ function () {
.getInstallLocation(ENIGMAIL_EXTENSION_ID);
var extensionLoc = installLoc.getItemFile(ENIGMAIL_EXTENSION_ID, "wrappers");
extensionLoc.append("gpg-agent-wrapper.sh");
- extensionLoc.permissions=0755;
agentProcess = Components.classes[NS_PROCESS_UTIL_CONTRACTID].createInstance(Components.interfaces.nsIProcess);
agentProcess.init(extensionLoc);
agentProcess.run(true, [ "stop", this.gpgAgentProcess ], 2);
@@ -1758,7 +1757,6 @@ function (domWindow) {
.getInstallLocation(ENIGMAIL_EXTENSION_ID);
var extensionLoc = installLoc.getItemFile(ENIGMAIL_EXTENSION_ID, "wrappers");
extensionLoc.append("gpg-agent-wrapper.sh");
- extensionLoc.permissions=0755;
args.unshift(command.path);
args.unshift("start");
command = extensionLoc;
remove-static.patch:
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE remove-static.patch ---
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
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.
//
xulrunner-missing-headers.patch:
file_id.cc | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE xulrunner-missing-headers.patch ---
diff -up mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/file_id.cc.stat mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/file_id.cc
--- mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/file_id.cc.stat 2010-06-16 15:12:57.000000000 +0200
+++ mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/file_id.cc 2010-06-16 15:13:02.000000000 +0200
@@ -42,6 +42,7 @@
#include <link.h>
#include <string.h>
#include <sys/mman.h>
+#include <sys/stat.h>
#include <unistd.h>
#include <algorithm>
Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-13/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 22 Jul 2010 08:21:17 -0000 1.7
@@ -1,2 +1,2 @@
-f004aa5ddf2a30b5df96e06df416b0c9 thunderbird-3.0.1.source.tar.bz2
-508ca9ab0396afb49e82eda88014924b enigmail-1.0.1.tar.gz
+3a8479252bb9a0c534870896fc10e2ff thunderbird-3.1.1.source.tar.bz2
+7d329d5e8afbbb28214ca1995beb09c9 enigmail-1.1.2.tar.gz
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-13/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 22 Jul 2010 08:21:17 -0000 1.6
@@ -2,12 +2,11 @@
%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 libnotify_version 0.4
%global moz_objdir objdir-tb
-%global thunver 3.0.1
-#global CVS 20091121
+%global thunver 3.1.1
# The tarball is pretty inconsistent with directory structure.
# Sometimes there is a top level directory. That goes here.
@@ -15,25 +14,27 @@
# 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 mozappdir %{_libdir}/%{name}-%{version_internal}
+%global version_internal 3.1
+%global 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.0.1
-%if 0%{?CVS}
-Release: 0.1.cvs%{CVS}%{?dist}
+Version: 1.1.2
+%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,37 +47,40 @@
# 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
Source101: enigmail-fixlang.php
-# 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
+# Fix missing includes for crash reporter, remove in 3.1 final
+Patch5: xulrunner-missing-headers.patch
+Patch6: remove-static.patch
+# Enigmail patch
+Patch101: enigmail-1.1.2-perm.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)
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
@@ -111,20 +115,11 @@
# because provided by xulrunner).
AutoReq: 0
# All others deps already required by thunderbird
-Requires: gnupg, thunderbird >= %{thunver}
+Requires: gnupg, thunderbird >= %{version_internal}
# Nothing usefull provided
AutoProv: 0
-%global enigmail_extname '{847b3a00-7ab1-11d4-8f02-006008948af5}'
-%global tbupdate \\\
- %{_libdir}/%{name}/mozilla-extension-update.sh \\\
- --appname thunderbird \\\
- --extname %{enigmail_extname} \\\
- --basedir %{_libdir} \\\
- --extpath %{_libdir}/%{name} \\\
- --action
-
%description
Enigmail is an extension to the mail client Mozilla Thunderbird
@@ -137,20 +132,22 @@
%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
+%patch5 -p0 -b .stat
+%patch6 -p1 -b .static
%if %{official_branding}
# Required by Mozilla Corporation
-
%else
# Not yet approved by Mozillla Corporation
-
%endif
@@ -176,6 +173,9 @@
popd
%else
tar xzf %{SOURCE100} -C mailnews/extensions
+pushd mailnews/extensions/enigmail
+%patch101 -p1
+popd
%endif
#===============================================================================
@@ -183,6 +183,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//')
@@ -230,56 +233,38 @@
cd %{tarballdir}
%{__rm} -rf $RPM_BUILD_ROOT
-%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}
-
-%{__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
+%{__mkdir_p} $RPM_BUILD_ROOT%{enigmail_extname}
+%{__unzip} -q %{moz_objdir}/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
-%post
-%{tbupdate} install || :
-
-
-%preun
-if [ $1 = 0 ]; then
- %{tbupdate} remove || :
-fi
-
-%postun
-# This is needed not to reverse the effect of our preun, which
-# is guarded against upgrade, but because of our triggerun,
-# which is run on self-upgrade, though triggerpostun isn't
-if [ $1 != 0 ]; then
- %{tbupdate} install || :
-fi
-
-%triggerin -- thunderbird
-%{tbupdate} install || :
-
-%triggerun -- thunderbird
-%{tbupdate} remove || :
-
-%triggerpostun -- thunderbird
-# Guard against being run post-self-uninstall, even though that
-# doesn't happen currently (see comment above)
-if [ $1 != 0 ]; then
- %{tbupdate} install || :
-fi
-
-
%files
%defattr(-,root,root,-)
-%{_libdir}/%{name}
+%{enigmail_extname}
#===============================================================================
%changelog
+* 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)
+- sync patches with F-13
+
+* 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
+
+* 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/F-13/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 22 Jul 2010 08:21:17 -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/F-13/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 22 Jul 2010 08:21:17 -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
+
+
--- mozilla-extension-update.sh DELETED ---
--- thunderbird-3.0-ppc64.patch DELETED ---
--- thunderbird-clipboard-crash.patch DELETED ---
13 years, 9 months
rpms/thunderbird-enigmail/devel enigmail-1.1.2-perm.patch, NONE, 1.1 remove-static.patch, NONE, 1.1 xulrunner-missing-headers.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.8, 1.9 thunderbird-enigmail.spec, 1.8, 1.9 mozilla-extension-update.sh, 1.1, NONE
by Remi Collet
Author: remi
Update of /cvs/free/rpms/thunderbird-enigmail/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3162
Modified Files:
.cvsignore sources thunderbird-enigmail.spec
Added Files:
enigmail-1.1.2-perm.patch remove-static.patch
xulrunner-missing-headers.patch
Removed Files:
mozilla-extension-update.sh
Log Message:
update to 1.1.2 and move to /usr/lib/mozilla/extensions
enigmail-1.1.2-perm.patch:
enigmail.js | 2 --
1 file changed, 2 deletions(-)
--- NEW FILE enigmail-1.1.2-perm.patch ---
diff -up enigmail-1.1.2/package/enigmail.js.perm enigmail-1.1.2/package/enigmail.js
--- enigmail-1.1.2/package/enigmail.js.perm 2010-06-30 19:18:50.000000000 +0200
+++ enigmail-1.1.2/package/enigmail.js 2010-06-30 19:19:22.000000000 +0200
@@ -1231,7 +1231,6 @@ function () {
.getInstallLocation(ENIGMAIL_EXTENSION_ID);
var extensionLoc = installLoc.getItemFile(ENIGMAIL_EXTENSION_ID, "wrappers");
extensionLoc.append("gpg-agent-wrapper.sh");
- extensionLoc.permissions=0755;
agentProcess = Components.classes[NS_PROCESS_UTIL_CONTRACTID].createInstance(Components.interfaces.nsIProcess);
agentProcess.init(extensionLoc);
agentProcess.run(true, [ "stop", this.gpgAgentProcess ], 2);
@@ -1758,7 +1757,6 @@ function (domWindow) {
.getInstallLocation(ENIGMAIL_EXTENSION_ID);
var extensionLoc = installLoc.getItemFile(ENIGMAIL_EXTENSION_ID, "wrappers");
extensionLoc.append("gpg-agent-wrapper.sh");
- extensionLoc.permissions=0755;
args.unshift(command.path);
args.unshift("start");
command = extensionLoc;
remove-static.patch:
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE remove-static.patch ---
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
xulrunner-missing-headers.patch:
file_id.cc | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE xulrunner-missing-headers.patch ---
diff -up mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/file_id.cc.stat mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/file_id.cc
--- mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/file_id.cc.stat 2010-06-16 15:12:57.000000000 +0200
+++ mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/file_id.cc 2010-06-16 15:13:02.000000000 +0200
@@ -42,6 +42,7 @@
#include <link.h>
#include <string.h>
#include <sys/mman.h>
+#include <sys/stat.h>
#include <unistd.h>
#include <algorithm>
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 26 Jun 2010 08:09:53 -0000 1.7
+++ .cvsignore 22 Jul 2010 07:08:48 -0000 1.8
@@ -1,2 +1,2 @@
-thunderbird-3.1.source.tar.bz2
-enigmail-1.1.1.tar.gz
+thunderbird-3.1.1.source.tar.bz2
+enigmail-1.1.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 26 Jun 2010 17:54:40 -0000 1.8
+++ sources 22 Jul 2010 07:08:48 -0000 1.9
@@ -1,2 +1,2 @@
-feb4d737d568066076879a09bd0d506e thunderbird-3.1.source.tar.bz2
-a0f424cf2eb3a29a6cbb70669a0765bc enigmail-1.1.1.tar.gz
+3a8479252bb9a0c534870896fc10e2ff thunderbird-3.1.1.source.tar.bz2
+7d329d5e8afbbb28214ca1995beb09c9 enigmail-1.1.2.tar.gz
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-enigmail.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- thunderbird-enigmail.spec 26 Jun 2010 17:54:40 -0000 1.8
+++ thunderbird-enigmail.spec 22 Jul 2010 07:08:48 -0000 1.9
@@ -6,7 +6,7 @@
%global libnotify_version 0.4
%global moz_objdir objdir-tb
-%global thunver 3.1
+%global thunver 3.1.1
# The tarball is pretty inconsistent with directory structure.
# Sometimes there is a top level directory. That goes here.
@@ -19,16 +19,17 @@
%global official_branding 1
%global version_internal 3.1
-%global mozappdir %{_libdir}/%{name}-%{version_internal}
+%global 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.1
+Version: 1.1.2
%if 0%{?prever:1}
Release: 0.1.%{prever}%{?dist}
%else
-Release: 2%{?dist}
+Release: 1%{?dist}
%endif
URL: http://enigmail.mozdev.org/
License: MPLv1.1 or GPLv2+
@@ -52,9 +53,6 @@
# http://www.mozdev.org/pipermail/enigmail/2009-April/011018.html
Source101: enigmail-fixlang.php
-# From sunbird.src.rpm
-Source102: mozilla-extension-update.sh
-
# Fix for version issues
Patch0: thunderbird-version.patch
# Fix for jemalloc
@@ -63,6 +61,12 @@
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
+
+# Enigmail patch
+Patch101: enigmail-1.1.2-perm.patch
%if %{official_branding}
# Required by Mozilla Corporation
@@ -111,20 +115,11 @@
# because provided by xulrunner).
AutoReq: 0
# All others deps already required by thunderbird
-Requires: gnupg, thunderbird >= %{thunver}
+Requires: gnupg, thunderbird >= %{version_internal}
# Nothing usefull provided
AutoProv: 0
-%global enigmail_extname '{847b3a00-7ab1-11d4-8f02-006008948af5}'
-%global tbupdate \\\
- %{_libdir}/%{name}/mozilla-extension-update.sh \\\
- --appname thunderbird \\\
- --extname %{enigmail_extname} \\\
- --basedir %{_libdir} \\\
- --extpath %{_libdir}/%{name} \\\
- --action
-
%description
Enigmail is an extension to the mail client Mozilla Thunderbird
@@ -144,6 +139,8 @@
%patch1 -p0 -b .jemalloc
%patch2 -p1 -b .shared-error
%patch4 -p1 -b .protected
+%patch5 -p0 -b .stat
+%patch6 -p1 -b .static
%if %{official_branding}
# Required by Mozilla Corporation
@@ -176,6 +173,9 @@
popd
%else
tar xzf %{SOURCE100} -C mailnews/extensions
+pushd mailnews/extensions/enigmail
+%patch101 -p1
+popd
%endif
#===============================================================================
@@ -233,56 +233,29 @@
cd %{tarballdir}
%{__rm} -rf $RPM_BUILD_ROOT
-%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}
+%{__mkdir_p} $RPM_BUILD_ROOT%{enigmail_extname}
-%{__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
+%{__unzip} -q %{moz_objdir}/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
-%post
-%{tbupdate} install || :
-
-
-%preun
-if [ $1 = 0 ]; then
- %{tbupdate} remove || :
-fi
-
-%postun
-# This is needed not to reverse the effect of our preun, which
-# is guarded against upgrade, but because of our triggerun,
-# which is run on self-upgrade, though triggerpostun isn't
-if [ $1 != 0 ]; then
- %{tbupdate} install || :
-fi
-
-%triggerin -- thunderbird
-%{tbupdate} install || :
-
-%triggerun -- thunderbird
-%{tbupdate} remove || :
-
-%triggerpostun -- thunderbird
-# Guard against being run post-self-uninstall, even though that
-# doesn't happen currently (see comment above)
-if [ $1 != 0 ]; then
- %{tbupdate} install || :
-fi
-
-
%files
%defattr(-,root,root,-)
-%{_libdir}/%{name}
+%{enigmail_extname}
#===============================================================================
%changelog
+* 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)
+- sync patches with F-13
+
* Sat Jun 26 2010 Remi Collet <rpms(a)famillecollet.com> 1.1.1-2
- new sources (only fix displayed version)
--- mozilla-extension-update.sh DELETED ---
13 years, 9 months
rpms/pragha/F-12 pragha.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Christoph Wickert
Author: cwickert
Update of /cvs/free/rpms/pragha/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31687/F-12
Modified Files:
.cvsignore sources
Added Files:
pragha.spec
Log Message:
initial build of pragha for this branch
--- NEW FILE pragha.spec ---
Name: pragha
Version: 0.7.7.1
Release: 1%{?dist}
Summary: Lightweight GTK+ music manager
Group: Applications/Multimedia
License: GPLv3+
URL: http://pragha.wikispaces.com/
Source0: http://dissonance.googlecode.com/files/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel >= 1.0.15
BuildRequires: dbus-glib-devel >= 0.74
BuildRequires: gtk2-devel >= 2.16.0
BuildRequires: flac-devel >= 1.2.1
BuildRequires: libao-devel >= 0.8.8
BuildRequires: libcddb-devel >= 1.2.1
BuildRequires: libcdio-devel >= 0.78
BuildRequires: libcurl-devel >= 7.18
BuildRequires: libmad-devel >= 0.15
BuildRequires: libmodplug-devel
BuildRequires: libnotify-devel >= 0.4.4
BuildRequires: libsndfile-devel >= 1.0.17
BuildRequires: libvorbis-devel >= 1.2.0
BuildRequires: sqlite-devel >= 3.4
BuildRequires: taglib-devel >= 1.4
BuildRequires: desktop-file-utils
BuildRequires: gettext
%description
Pragha is is a lightweight GTK+ music manager that aims to be fast, bloat-free,
and light on memory consumption. It is written completely in C and GTK+.
This it is a fork of Consonance Music Manager, discontinued by the original
author.
%prep
%setup -q
# Fix spurious executable permissions
chmod 0644 ChangeLog src/*.{c,h}
%build
%configure
make %{?_smp_mflags} V=1
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install \
--delete-original \
--remove-category=Application \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
%find_lang %{name}
# remove duplicate docs
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}/doc
%clean
rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database &> /dev/null || :
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-desktop-database &> /dev/null || :
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f %{name}.lang
%defattr(-,root,root,-)
# FIXME add AUTHORS and README if not empty
%doc ChangeLog FAQ
%{_bindir}/pragha
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*x*/apps/%{name}.png
%{_datadir}/pixmaps/%{name}/
%{_datadir}/%{name}/
%{_mandir}/man1/pragha.1.*
%changelog
* Fri Jun 25 2010 Christoph Wickert <cwickert(a)fedoraproject.org> - 0.7.7.1-1
- Update to 0.7.7.1
* Fri Jun 25 2010 Christoph Wickert <cwickert(a)fedoraproject.org> - 0.7.7-1
- Update to 0.7.7
* Sat Jun 19 2010 Christoph Wickert <cwickert(a)fedoraproject.org> - 0.7.6-1
- Update to 0.7.6
- Remove upstreamed use-software-mixer.patch
* Fri Apr 22 2010 Christoph Wickert <cwickert(a)fedoraproject.org> - 0.7.4-1
- Update to 0.7.4
* Mon Mar 22 2010 Christoph Wickert <cwickert(a)fedoraproject.org> - 0.7.3-2
- Use software mixer by default to cope with pulseaudio
- Remove executable bits from docs
* Tue Mar 16 2010 Christoph Wickert <cwickert(a)fedoraproject.org> - 0.7.3-1
- Update to 0.7.3
* Sat Feb 20 2010 Christoph Wickert <cwickert(a)fedoraproject.org> - 0.7.2-1
- Update to 0.7.2
* Wed Oct 28 2009 Christoph Wickert <cwickert(a)fedoraproject.org> - 0.7.1-1
- Upadte to 0.7.1
* Sat Oct 03 2009 Christoph Wickert <cwickert(a)fedoraproject.org> - 0.7.0-1
- Upadte to 0.7.0
* Sun Aug 09 2009 Christoph Wickert <cwickert(a)fedoraproject.org> - 0.6.3-1
- Upadte to 0.6.3
* Mon Jul 20 2009 Christoph Wickert <cwickert(a)fedoraproject.org> - 0.6.2.2-1
- Initial Fedora package
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/pragha/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 19 Jul 2010 17:54:02 -0000 1.1
+++ .cvsignore 21 Jul 2010 19:56:03 -0000 1.2
@@ -0,0 +1 @@
+pragha-0.7.7.1.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/pragha/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 19 Jul 2010 17:54:02 -0000 1.1
+++ sources 21 Jul 2010 19:56:03 -0000 1.2
@@ -0,0 +1 @@
+73d5fdd6d2eb5434cff0087d29e6e630 pragha-0.7.7.1.tar.bz2
13 years, 9 months
rpms/pragha/F-13 pragha.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Christoph Wickert
Author: cwickert
Update of /cvs/free/rpms/pragha/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31687/F-13
Modified Files:
.cvsignore sources
Added Files:
pragha.spec
Log Message:
initial build of pragha for this branch
--- NEW FILE pragha.spec ---
Name: pragha
Version: 0.7.7.1
Release: 1%{?dist}
Summary: Lightweight GTK+ music manager
Group: Applications/Multimedia
License: GPLv3+
URL: http://pragha.wikispaces.com/
Source0: http://dissonance.googlecode.com/files/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel >= 1.0.15
BuildRequires: dbus-glib-devel >= 0.74
BuildRequires: gtk2-devel >= 2.16.0
BuildRequires: flac-devel >= 1.2.1
BuildRequires: libao-devel >= 0.8.8
BuildRequires: libcddb-devel >= 1.2.1
BuildRequires: libcdio-devel >= 0.78
BuildRequires: libcurl-devel >= 7.18
BuildRequires: libmad-devel >= 0.15
BuildRequires: libmodplug-devel
BuildRequires: libnotify-devel >= 0.4.4
BuildRequires: libsndfile-devel >= 1.0.17
BuildRequires: libvorbis-devel >= 1.2.0
BuildRequires: sqlite-devel >= 3.4
BuildRequires: taglib-devel >= 1.4
BuildRequires: desktop-file-utils
BuildRequires: gettext
%description
Pragha is is a lightweight GTK+ music manager that aims to be fast, bloat-free,
and light on memory consumption. It is written completely in C and GTK+.
This it is a fork of Consonance Music Manager, discontinued by the original
author.
%prep
%setup -q
# Fix spurious executable permissions
chmod 0644 ChangeLog src/*.{c,h}
%build
%configure
make %{?_smp_mflags} V=1
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install \
--delete-original \
--remove-category=Application \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
%find_lang %{name}
# remove duplicate docs
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}/doc
%clean
rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database &> /dev/null || :
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-desktop-database &> /dev/null || :
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f %{name}.lang
%defattr(-,root,root,-)
# FIXME add AUTHORS and README if not empty
%doc ChangeLog FAQ
%{_bindir}/pragha
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*x*/apps/%{name}.png
%{_datadir}/pixmaps/%{name}/
%{_datadir}/%{name}/
%{_mandir}/man1/pragha.1.*
%changelog
* Fri Jun 25 2010 Christoph Wickert <cwickert(a)fedoraproject.org> - 0.7.7.1-1
- Update to 0.7.7.1
* Fri Jun 25 2010 Christoph Wickert <cwickert(a)fedoraproject.org> - 0.7.7-1
- Update to 0.7.7
* Sat Jun 19 2010 Christoph Wickert <cwickert(a)fedoraproject.org> - 0.7.6-1
- Update to 0.7.6
- Remove upstreamed use-software-mixer.patch
* Fri Apr 22 2010 Christoph Wickert <cwickert(a)fedoraproject.org> - 0.7.4-1
- Update to 0.7.4
* Mon Mar 22 2010 Christoph Wickert <cwickert(a)fedoraproject.org> - 0.7.3-2
- Use software mixer by default to cope with pulseaudio
- Remove executable bits from docs
* Tue Mar 16 2010 Christoph Wickert <cwickert(a)fedoraproject.org> - 0.7.3-1
- Update to 0.7.3
* Sat Feb 20 2010 Christoph Wickert <cwickert(a)fedoraproject.org> - 0.7.2-1
- Update to 0.7.2
* Wed Oct 28 2009 Christoph Wickert <cwickert(a)fedoraproject.org> - 0.7.1-1
- Upadte to 0.7.1
* Sat Oct 03 2009 Christoph Wickert <cwickert(a)fedoraproject.org> - 0.7.0-1
- Upadte to 0.7.0
* Sun Aug 09 2009 Christoph Wickert <cwickert(a)fedoraproject.org> - 0.6.3-1
- Upadte to 0.6.3
* Mon Jul 20 2009 Christoph Wickert <cwickert(a)fedoraproject.org> - 0.6.2.2-1
- Initial Fedora package
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/pragha/F-13/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 19 Jul 2010 17:54:02 -0000 1.1
+++ .cvsignore 21 Jul 2010 19:56:03 -0000 1.2
@@ -0,0 +1 @@
+pragha-0.7.7.1.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/pragha/F-13/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 19 Jul 2010 17:54:02 -0000 1.1
+++ sources 21 Jul 2010 19:56:03 -0000 1.2
@@ -0,0 +1 @@
+73d5fdd6d2eb5434cff0087d29e6e630 pragha-0.7.7.1.tar.bz2
13 years, 9 months
rpms/ffmpeg/devel ffmpeg.spec,1.33,1.34
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19482
Modified Files:
ffmpeg.spec
Log Message:
Enable libva
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ffmpeg.spec 21 Jul 2010 17:02:00 -0000 1.33
+++ ffmpeg.spec 21 Jul 2010 17:03:57 -0000 1.34
@@ -28,7 +28,7 @@
BuildRequires: libdc1394-devel
BuildRequires: librtmp-devel
BuildRequires: libtheora-devel
-%{?_with_vaapi:BuildRequires:libva-devel >= 0.31.0}
+BuildRequires: libva-devel >= 0.31.0
BuildRequires: libvdpau-devel
BuildRequires: libvorbis-devel
BuildRequires: libvpx-devel >= 0.9.1
@@ -231,7 +231,8 @@
%changelog
* Wed Jul 21 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 0.6-4.20100704svn
-- rebuilt
+- Enable libva
+- Restore compatibility --with amr
* Mon Jul 05 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 0.6-3.20100704svn
- Fix build using --define ffmpegsuffix 'foo'
13 years, 9 months