diff options
| -rw-r--r-- | mozplugger/SOURCES/mozplugger-1.13.3-path.patch | 12 | ||||
| -rw-r--r-- | mozplugger/SOURCES/mozplugger-1.14.2.tar.gz | bin | 0 -> 93406 bytes | |||
| -rw-r--r-- | mozplugger/SOURCES/sugar-pdf-plugin.patch | 80 | ||||
| -rw-r--r-- | mozplugger/SPECS/mozplugger.spec | 188 |
4 files changed, 280 insertions, 0 deletions
diff --git a/mozplugger/SOURCES/mozplugger-1.13.3-path.patch b/mozplugger/SOURCES/mozplugger-1.13.3-path.patch new file mode 100644 index 0000000..f4dfb83 --- /dev/null +++ b/mozplugger/SOURCES/mozplugger-1.13.3-path.patch @@ -0,0 +1,12 @@ +diff -up mozplugger-1.13.3/mozpluggerrc.path mozplugger-1.13.3/mozpluggerrc +--- mozplugger-1.13.3/mozpluggerrc.path 2010-04-17 00:05:05.000000000 +0200 ++++ mozplugger-1.13.3/mozpluggerrc 2010-04-20 12:07:57.000000000 +0200 +@@ -352,7 +352,7 @@ application/vnd.oasis.opendocument.prese + chemical/x-pdb:pdb: Protein Data Bank file + model/x-pdb:pdb: Protein Data Bank file + swallow(rasmol) fill: rasmol "$file" +- swallow(molecule) fill: /usr/X11R6/lib/xscreensaver/molecule -delay 20000 -geometry +9000+9000 -no-spin -molecule "$file" ++ swallow(molecule) fill: /usr/libexec/xscreensaver/molecule -delay 20000 -geometry +9000+9000 -no-spin -molecule "$file" + + application/bge:blend:Blender Game Engine + swallow(%f): blenderplayer $file diff --git a/mozplugger/SOURCES/mozplugger-1.14.2.tar.gz b/mozplugger/SOURCES/mozplugger-1.14.2.tar.gz Binary files differnew file mode 100644 index 0000000..428019a --- /dev/null +++ b/mozplugger/SOURCES/mozplugger-1.14.2.tar.gz diff --git a/mozplugger/SOURCES/sugar-pdf-plugin.patch b/mozplugger/SOURCES/sugar-pdf-plugin.patch new file mode 100644 index 0000000..01a07a6 --- /dev/null +++ b/mozplugger/SOURCES/sugar-pdf-plugin.patch @@ -0,0 +1,80 @@ +diff -uNr mozplugger-1.14.2/Makefile mozplugger-1.14.2-olpc/Makefile +--- mozplugger-1.14.2/Makefile 2010-09-18 05:51:05.000000000 -0300 ++++ mozplugger-1.14.2-olpc/Makefile 2011-06-02 16:07:15.085910995 -0300 +@@ -9,10 +9,6 @@ + # For installing + prefix=/usr + +-# On 64 bit arch change libprefix to lib64 +-libprefix=/lib +-#libprefix=/lib64 +- + # + # + RPMDIR=/usr/src/RPM +@@ -129,7 +125,7 @@ + NORM_LDFLAGS= + XCFLAGS=-shared + XLDFLAGS=-shared +-XLIBDIR = $(X11)$(libprefix) ++XLIBDIR = $(X11)$(lib) + XLIBS=-lX11 -L$(XLIBDIR) + EXTRA_LIBS= + +@@ -202,13 +198,13 @@ + + install: + -@mkdir -p $(root)$(prefix)/bin +- -@mkdir -p $(root)$(prefix)$(libprefix)/mozilla/plugins ++ -@mkdir -p $(root)$(prefix)$(lib)/mozilla/plugins + -@mkdir -p $(root)$(prefix)/share/man/man7 + -@mkdir -p $(root)/etc + cp mozplugger-helper $(root)$(prefix)/bin/ + cp mozplugger-controller $(root)$(prefix)/bin/ + cp mozplugger-linker $(root)$(prefix)/bin/ +- cp mozplugger.so $(root)$(prefix)$(libprefix)/mozilla/plugins/ ++ cp mozplugger.so $(root)$(prefix)$(lib)/mozilla/plugins/ + cp mozpluggerrc $(root)/etc/ + cp mozplugger.7 $(root)$(prefix)/share/man/man7/ + +diff -uNr mozplugger-1.14.2/mozplugger.c mozplugger-1.14.2-olpc/mozplugger.c +--- mozplugger-1.14.2/mozplugger.c 2010-09-18 05:51:05.000000000 -0300 ++++ mozplugger-1.14.2-olpc/mozplugger.c 2011-06-02 16:00:01.547911001 -0300 +@@ -64,7 +64,6 @@ + typedef struct data + { + Display *display; +- char *displayname; + NPWindow windata; + pid_t pid; + int commsPipeFd; +@@ -268,8 +267,6 @@ + + my_putenv(buffer, &offset, "winname", THIS->winname); + +- my_putenv(buffer, &offset, "DISPLAY", THIS->displayname); +- + for (i = 0; i < THIS->num_arguments; i++) + { + my_putenv(buffer, &offset, THIS->args[i].name, THIS->args[i].value); +@@ -302,11 +299,10 @@ + _exit(EX_UNAVAILABLE); /* Child exit, that's OK */ + } + +- D("Executing helper: %s %s %s %s %s %s\n", ++ D("Executing helper: %s %s %s %s %s\n", + launcher, + buffer, + file, +- THIS->displayname, + THIS->command, + THIS->mimetype); + +@@ -3004,7 +3000,6 @@ + THIS = instance->pdata; + + THIS->display = ((NPSetWindowCallbackStruct *)window->ws_info)->display; +- THIS->displayname = XDisplayName(DisplayString(THIS->display)); + THIS->windata = *window; + + if ((THIS->url) && (THIS->browserCantHandleIt)) diff --git a/mozplugger/SPECS/mozplugger.spec b/mozplugger/SPECS/mozplugger.spec new file mode 100644 index 0000000..0b54eac --- /dev/null +++ b/mozplugger/SPECS/mozplugger.spec @@ -0,0 +1,188 @@ +Summary: A generic mozilla plug-in +Name: mozplugger +Version: 1.14.2 +Release: 1%{?dist} +License: GPLv2+ +Group: Applications/Internet +Url: http://mozplugger.mozdev.org/ +Source0: http://mozplugger.mozdev.org/files/%{name}-%{version}.tar.gz + +# fix #513470, using a wrong path for executable +Patch1: mozplugger-1.13.3-path.patch +Patch2: sugar-pdf-plugin.patch + +Requires: m4 +Requires: sox +Requires: mozilla-filesystem + +BuildRequires: libX11-devel +BuildRequires: libXt-devel +BuildRequires: coreutils + +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + +%description +MozPlugger is a generic Mozilla plug-in that allows the use of standard Linux +programs as plug-ins for media types on the Internet. +Test modified version + +%prep +%setup -q +%patch1 -p1 -b .path +%patch2 -p1 + +%build +make linux + +%install +rm -rf %{buildroot} +make install libprefix=/%{_lib} root=%{buildroot} + +# convert to UTF8 +file=%{buildroot}%{_mandir}/man7/mozplugger.7 +iconv -f iso-8859-1 -t utf-8 < "$file" > "${file}_" +mv "${file}_" "$file" +iconv -f iso-8859-1 -t utf-8 < README > README_ +mv README_ README + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%doc README COPYING +%config(noreplace) /etc/mozpluggerrc +%{_bindir}/* +%{_prefix}/mozilla/plugins/mozplugger.so +%{_mandir}/man7/mozplugger.7* + +%changelog +* Wed Sep 29 2010 Than Ngo <than@redhat.com> - 1.14.2-1 +- 1.14.2 + +* Mon Aug 09 2010 Than Ngo <than@redhat.com> - 1.14.1-1 +- 1.14.1 + +* Tue Apr 20 2010 Than Ngo <than@redhat.com> - 1.13.3-1 +- 1.13.3, fix crash in mozplugger bz#553935 + +* Fri Aug 21 2009 Than Ngo <than@redhat.com> - 1.12.1-7 +- drop Obsoletes on plugger +- add comments for the patches +- add noreplace +- convert README to utf8 + +* Fri Aug 21 2009 Than Ngo <than@redhat.com> - 1.12.1-6 +- fix #226159, merge review + +* Thu Aug 20 2009 Than Ngo <than@redhat.com> - 1.12.1-5 +- fix #513470, using a wrong path for executable + +* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.12.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri Jul 03 2009 Than Ngo <than@redhat.com> - 1.12.1-3 +- fix #469257, selinux policy and mozplugger do not get along + +* Thu Jul 2 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.12.1-2 +- Add dependency on m4 (#453306). + +* Thu May 14 2009 Than Ngo <than@redhat.com> - 1.12.1-1 +- 1.12.1 + +* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.10.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa@redhat.com> 1.10.1-3 +- fix license tag + +* Thu Apr 10 2008 Karsten Hopp <karsten@redhat.com> 1.10.1-2 +- use RPM_OPT_FLAGS (#249976, Ville Skyttä) + +* Wed Feb 06 2008 Than Ngo <than@redhat.com> 1.10.1-1 +- 1.10.1 + +* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1.7.3-3.1 +- rebuild + +* Tue May 16 2006 Than Ngo <than@redhat.com> 1.7.3-3 +- fix #191969, Missing BuildRequire on libXt-devel +- adjust mozpluggerc for FC + +* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.7.3-2.2.1 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1.7.3-2.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com> +- rebuilt + +* Tue Nov 08 2005 Than Ngo <than@redhat.com> 1.7.3-2 +- get rid of xorg-x11-devel, fix for modular X + +* Fri Oct 14 2005 Florian La Roche <laroche@redhat.com> +- update to 1.7.3 + +* Mon Apr 4 2005 Elliot Lee <sopwith@redhat.com> - 1.7.1-4 +- Remove mikmod dep + +* Sat Mar 05 2005 Than Ngo <than@redhat.com> 1.7.1-3 +- rebuild + +* Thu Feb 03 2005 Than Ngo <than@redhat.com> 1.7.1-2 +- drop xloadimage dependency + +* Thu Jan 20 2005 Than Ngo <than@redhat.com> 1.7.1-1 +- update to 1.7.1 +- remove mozplugger-1.6-2-ia64.patch, it's included in new upstream + +* Mon Dec 06 2004 Than Ngo <than@redhat.com> 1.6.2-4 +- add fix for ia64 +- enable s390 s390x build + +* Wed Nov 24 2004 Miloslav Trmac <mitr@redhat.com> - 1.6.2-3 +- Convert man page to UTF-8 + +* Fri Oct 29 2004 Than Ngo <than@redhat.com> 1.6.2-2 +- add missing Buildprereq on XFree86-devel #137564 + +* Tue Sep 28 2004 Than Ngo <than@redhat.com> 1.6.2-1 +- update to 1.6.2 +- get rid of requires mozilla + +* Tue Aug 31 2004 Than Ngo <than@redhat.com> 1.6.1-1 +- update to 1.6.1 + +* Sun Jul 25 2004 Than Ngo <than@redhat.com> 1.6.0-1 +- update to 1.6.0 +- fix broken deps + +* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com> +- rebuilt + +* Wed Apr 07 2004 Than Ngo <than@redhat.com> 1.5.2-1 +- update to 1.5.2, fix #117424 +- remove mozplugger-1.5.0.patch that included in upstream + +* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com> +- rebuilt + +* Wed Feb 18 2004 Than Ngo <than@redhat.com> 1.5.0-3 +- drop mozplugger-1.1.3-redhat.patch, it's included in new upstream +- add patch file to fix swallow issue, thanks to Louis Bavoil + +* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com> +- rebuilt + +* Fri Jan 16 2004 Than Ngo <than@redhat.com> 1.5.0-1 +- 1.5.0 + +* Fri Sep 26 2003 Harald Hoyer <harald@redhat.de> 1.3.2-1 +- 1.3.2 + +* Thu Sep 04 2003 Than Ngo <than@redhat.com> 1.3.1-1 +- 1.3.1 + +* Wed May 7 2003 Than Ngo <than@redhat.com> 1.1.3-1 +- initial build |