From 58a20cc2da4a819260b9a36d0a7c22613f68ac25 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 03:34:12 +0000 Subject: [PATCH 01/11] Initialize branch F-13 for xulrunner-python --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From cc108cb7bb0c9da87c24e7765e2da4850de6a324 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 16 Mar 2010 06:50:33 +0000 Subject: [PATCH 02/11] Set CFLAGS and CXXFLAGS variables to --- xulrunner-python.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/xulrunner-python.spec b/xulrunner-python.spec index a8669f5..d8fc0fc 100644 --- a/xulrunner-python.spec +++ b/xulrunner-python.spec @@ -5,7 +5,7 @@ Summary: Python interface for mozilla XPCOM library Name: xulrunner-python Version: 1.9.2 -Release: 2.%{hgver}%{?dist} +Release: 3.%{hgver}%{?dist} URL: http://developer.mozilla.org/en/PyXPCOM License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -46,7 +46,10 @@ autoconf-2.13 #--------------------------------------------------------------------- %build -cd %{objdir} +export CFLAGS=$RPM_OPT_FLAGS +export CXXFLAGS=$RPM_OPT_FLAGS + +cd %{objdir} ../configure --with-libxul-sdk=`pkg-config --variable=sdkdir libxul` \ --with-system-nspr \ --prefix=%{_prefix} \ @@ -121,6 +124,9 @@ popd #--------------------------------------------------------------------- %changelog +* Tue Mar 16 2010 Jan Horak - 1.9.2.3.20100111hg +- Set CFLAGS and CXXFLAGS variables to $RPM_OPT_FLAGS + * Wed Nov 25 2009 Martin Stransky 1.9.2-2.20100111hg - created as standalone package From e69b249876b57d74896ef38ad3194e16e9549c48 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 16 Mar 2010 07:50:46 +0000 Subject: [PATCH 03/11] Set CFLAGS and CXXFLAGS variables to --- xulrunner-python.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/xulrunner-python.spec b/xulrunner-python.spec index a8669f5..d8fc0fc 100644 --- a/xulrunner-python.spec +++ b/xulrunner-python.spec @@ -5,7 +5,7 @@ Summary: Python interface for mozilla XPCOM library Name: xulrunner-python Version: 1.9.2 -Release: 2.%{hgver}%{?dist} +Release: 3.%{hgver}%{?dist} URL: http://developer.mozilla.org/en/PyXPCOM License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -46,7 +46,10 @@ autoconf-2.13 #--------------------------------------------------------------------- %build -cd %{objdir} +export CFLAGS=$RPM_OPT_FLAGS +export CXXFLAGS=$RPM_OPT_FLAGS + +cd %{objdir} ../configure --with-libxul-sdk=`pkg-config --variable=sdkdir libxul` \ --with-system-nspr \ --prefix=%{_prefix} \ @@ -121,6 +124,9 @@ popd #--------------------------------------------------------------------- %changelog +* Tue Mar 16 2010 Jan Horak - 1.9.2.3.20100111hg +- Set CFLAGS and CXXFLAGS variables to $RPM_OPT_FLAGS + * Wed Nov 25 2009 Martin Stransky 1.9.2-2.20100111hg - created as standalone package From 2217b8b7fa45b01dc4dd770cd3ff74f536e24bff Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Mon, 26 Jul 2010 18:24:00 +0000 Subject: [PATCH 04/11] - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild --- xulrunner-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xulrunner-python.spec b/xulrunner-python.spec index d8fc0fc..3134d70 100644 --- a/xulrunner-python.spec +++ b/xulrunner-python.spec @@ -5,7 +5,7 @@ Summary: Python interface for mozilla XPCOM library Name: xulrunner-python Version: 1.9.2 -Release: 3.%{hgver}%{?dist} +Release: 4.%{hgver}%{?dist} URL: http://developer.mozilla.org/en/PyXPCOM License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -124,6 +124,9 @@ popd #--------------------------------------------------------------------- %changelog +* Mon Jul 26 2010 David Malcolm - 1.9.2-4.20100111hg +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + * Tue Mar 16 2010 Jan Horak - 1.9.2.3.20100111hg - Set CFLAGS and CXXFLAGS variables to $RPM_OPT_FLAGS From 75123861147ab4899f4ef4f431642dc3dd248e51 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:16:11 +0000 Subject: [PATCH 05/11] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 0698bdb..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xulrunner-python -# $Id$ -NAME := xulrunner-python -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 diff --git a/import.log b/import.log deleted file mode 100644 index 1a8b3eb..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -xulrunner-python-1_9_2-2_20100111hg_fc11:HEAD:xulrunner-python-1.9.2-2.20100111hg.fc11.src.rpm:1264808652 From c0e141db8fd0825d53e2b0e43f3973bdd198dd36 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:16:12 +0000 Subject: [PATCH 06/11] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 0698bdb..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xulrunner-python -# $Id$ -NAME := xulrunner-python -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index 1a8b3eb..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -xulrunner-python-1_9_2-2_20100111hg_fc11:HEAD:xulrunner-python-1.9.2-2.20100111hg.fc11.src.rpm:1264808652 From 45b1b58db36b58066266869be164df7f3b748fb2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 01:07:57 -0600 Subject: [PATCH 07/11] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- xulrunner-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xulrunner-python.spec b/xulrunner-python.spec index 3134d70..6a70ea8 100644 --- a/xulrunner-python.spec +++ b/xulrunner-python.spec @@ -5,7 +5,7 @@ Summary: Python interface for mozilla XPCOM library Name: xulrunner-python Version: 1.9.2 -Release: 4.%{hgver}%{?dist} +Release: 5.%{hgver}%{?dist} URL: http://developer.mozilla.org/en/PyXPCOM License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -124,6 +124,9 @@ popd #--------------------------------------------------------------------- %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 1.9.2-5.20100111hg +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Jul 26 2010 David Malcolm - 1.9.2-4.20100111hg - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild From 6692d9829b9c18032bf9a2f0d354e73f74509ac4 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 6 Apr 2011 19:12:45 +0100 Subject: [PATCH 08/11] update to latest HG snapshot to compile against xulrunner 2.0 --- .gitignore | 1 + sources | 2 +- xulrunner-python.spec | 16 ++++++---------- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 62039d2..784c7c4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ pyxpcom-1.9.2-20100111hg.tar.bz2 +/pyxpcom-2.0-20110406hg.tar.bz2 diff --git a/sources b/sources index 151eb36..1fc3623 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bc5b5d794ff2f79150f67dea7519a6f5 pyxpcom-1.9.2-20100111hg.tar.bz2 +d750928c7e098842a486400fe200de44 pyxpcom-2.0-20110406hg.tar.bz2 diff --git a/xulrunner-python.spec b/xulrunner-python.spec index 6a70ea8..351e29c 100644 --- a/xulrunner-python.spec +++ b/xulrunner-python.spec @@ -1,23 +1,19 @@ %define builddir %{_builddir}/%{name}-%{version} %define objdir objdir -%define hgver 20100111hg +%define hgver 20110406hg Summary: Python interface for mozilla XPCOM library Name: xulrunner-python -Version: 1.9.2 -Release: 5.%{hgver}%{?dist} +Version: 2.0 +Release: 1.%{hgver}%{?dist} URL: http://developer.mozilla.org/en/PyXPCOM License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet # Get by hg clone http://hg.mozilla.org/pyxpcom pyxpcom/src Source0: pyxpcom-%{version}-%{hgver}.tar.bz2 -# build patches -Patch0: xpcom-dynstr.patch - # --------------------------------------------------- -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: gecko-devel >= %{version} BuildRequires: autoconf213 BuildRequires: python-devel @@ -38,7 +34,6 @@ Development files for building Gecko applications written in python. %prep %setup -q -c -%patch0 -p1 -b .dynstr mkdir %{objdir} autoconf-2.13 @@ -59,8 +54,6 @@ make #--------------------------------------------------------------------- %install -%{__rm} -rf $RPM_BUILD_ROOT - # Some helpers %define distdir objdir/dist/bin %define includedir objdir/dist/include @@ -124,6 +117,9 @@ popd #--------------------------------------------------------------------- %changelog +* Wed Apr 6 2011 Peter Robinson - 2.0-1.20110604hg +- update to latest HG snapshot to compile against xulrunner 2.0 + * Tue Feb 08 2011 Fedora Release Engineering - 1.9.2-5.20100111hg - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From e0496ed577f9736d3343cc9182e980ff182dbe1a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 03:20:55 -0600 Subject: [PATCH 09/11] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- xulrunner-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xulrunner-python.spec b/xulrunner-python.spec index 351e29c..696d0b3 100644 --- a/xulrunner-python.spec +++ b/xulrunner-python.spec @@ -5,7 +5,7 @@ Summary: Python interface for mozilla XPCOM library Name: xulrunner-python Version: 2.0 -Release: 1.%{hgver}%{?dist} +Release: 2.%{hgver}%{?dist} URL: http://developer.mozilla.org/en/PyXPCOM License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -117,6 +117,9 @@ popd #--------------------------------------------------------------------- %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 2.0-2.20110406hg +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Wed Apr 6 2011 Peter Robinson - 2.0-1.20110604hg - update to latest HG snapshot to compile against xulrunner 2.0 From 86bc6793e0d0dfd861135ac0894d34db5aed8f03 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 22 Jul 2012 02:24:18 -0500 Subject: [PATCH 10/11] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- xulrunner-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xulrunner-python.spec b/xulrunner-python.spec index 696d0b3..5ffdc35 100644 --- a/xulrunner-python.spec +++ b/xulrunner-python.spec @@ -5,7 +5,7 @@ Summary: Python interface for mozilla XPCOM library Name: xulrunner-python Version: 2.0 -Release: 2.%{hgver}%{?dist} +Release: 3.%{hgver}%{?dist} URL: http://developer.mozilla.org/en/PyXPCOM License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -117,6 +117,9 @@ popd #--------------------------------------------------------------------- %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 2.0-3.20110406hg +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 14 2012 Fedora Release Engineering - 2.0-2.20110406hg - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 7f07cfbbbf9121f8c10f7cce862a9d9e08aea2e9 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 18 Dec 2012 20:03:58 +0000 Subject: [PATCH 11/11] package is dead --- dead.package | 1 + sources | 1 - xpcom-dynstr.patch | 18 ------ xulrunner-python.spec | 140 ------------------------------------------ 4 files changed, 1 insertion(+), 159 deletions(-) create mode 100644 dead.package delete mode 100644 sources delete mode 100644 xpcom-dynstr.patch delete mode 100644 xulrunner-python.spec diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..8fc538b --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Package is dead. It was only used by sugar-browse which has moved to webkitgtk3 diff --git a/sources b/sources deleted file mode 100644 index 1fc3623..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -d750928c7e098842a486400fe200de44 pyxpcom-2.0-20110406hg.tar.bz2 diff --git a/xpcom-dynstr.patch b/xpcom-dynstr.patch deleted file mode 100644 index c046f2f..0000000 --- a/xpcom-dynstr.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up xulrunner-python-1.9.2/config/config.mk.old xulrunner-python-1.9.2/config/config.mk ---- xulrunner-python-1.9.2/config/config.mk.old 2010-01-11 11:20:07.000000000 +0100 -+++ xulrunner-python-1.9.2/config/config.mk 2010-01-11 11:30:31.000000000 +0100 -@@ -639,14 +639,6 @@ else - ELF_DYNSTR_GC = : - endif - --ifndef CROSS_COMPILE --ifdef USE_ELF_DYNSTR_GC --ifdef MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS --ELF_DYNSTR_GC = $(DEPTH)/config/elf-dynstr-gc --endif --endif --endif -- - ifeq ($(OS_ARCH),Darwin) - ifdef NEXT_ROOT - export NEXT_ROOT diff --git a/xulrunner-python.spec b/xulrunner-python.spec deleted file mode 100644 index 5ffdc35..0000000 --- a/xulrunner-python.spec +++ /dev/null @@ -1,140 +0,0 @@ -%define builddir %{_builddir}/%{name}-%{version} -%define objdir objdir -%define hgver 20110406hg - -Summary: Python interface for mozilla XPCOM library -Name: xulrunner-python -Version: 2.0 -Release: 3.%{hgver}%{?dist} -URL: http://developer.mozilla.org/en/PyXPCOM -License: MPLv1.1 or GPLv2+ or LGPLv2+ -Group: Applications/Internet -# Get by hg clone http://hg.mozilla.org/pyxpcom pyxpcom/src -Source0: pyxpcom-%{version}-%{hgver}.tar.bz2 - -# --------------------------------------------------- - -BuildRequires: gecko-devel >= %{version} -BuildRequires: autoconf213 -BuildRequires: python-devel -Requires: gecko-libs >= %{version} - -%description -Files needed to run Gecko applications written in python. - -%package devel -Summary: Development files for python XPCOM interface -Group: Development/Libraries -Requires: xulrunner-python = %{version} - -%description devel -Development files for building Gecko applications written in python. - -#--------------------------------------------------------------------- - -%prep -%setup -q -c - -mkdir %{objdir} -autoconf-2.13 - -#--------------------------------------------------------------------- - -%build -export CFLAGS=$RPM_OPT_FLAGS -export CXXFLAGS=$RPM_OPT_FLAGS - -cd %{objdir} -../configure --with-libxul-sdk=`pkg-config --variable=sdkdir libxul` \ - --with-system-nspr \ - --prefix=%{_prefix} \ - --libdir=%{_libdir} -make - -#--------------------------------------------------------------------- - -%install -# Some helpers -%define distdir objdir/dist/bin -%define includedir objdir/dist/include -%define libdir objdir/dist/lib -%define idldir objdir/dist/idl - -function add_files() { -DIRECTORY=$1 -TARGET=$2 -INSTALL_DIR=$3 -%{__mkdir} -p $RPM_BUILD_ROOT/$INSTALL_DIR -if [ -n "$DIRECTORY" ]; then - %{__cp} -r $DIRECTORY/* $RPM_BUILD_ROOT/$INSTALL_DIR -fi -echo "%dir $INSTALL_DIR" >> %{builddir}/$TARGET -echo "$INSTALL_DIR/*" >> %{builddir}/$TARGET -} - -pushd . - -# Fix _xpcom.so rights -%{__chmod} 755 %{distdir}/python/xpcom/_xpcom.so - -# Install package binaries -echo %defattr\(-,root,root\) > %{builddir}/files.txt -add_files %{distdir} "files.txt" `pkg-config --variable=libdir libxul` - -# Install include files for devel package -echo %defattr\(-,root,root\) > %{builddir}/files-devel.txt -add_files %{includedir} "files-devel.txt" `pkg-config --variable=includedir libxul`/pyxpcom - -# Install idl for devel package -add_files %{idldir} "files-devel.txt" `pkg-config --variable=idldir libxul` - -# Install library for devel package -INSTALL_DIR=`pkg-config --variable=sdkdir libxul`/sdk/lib -LIB_DIR=`pkg-config --variable=libdir libxul` - -%{__mkdir} -p $RPM_BUILD_ROOT/$INSTALL_DIR -ln -s $LIB_DIR/libpyxpcom.so $RPM_BUILD_ROOT/$INSTALL_DIR - -add_files "" "files-devel.txt" $INSTALL_DIR - -popd - -#--------------------------------------------------------------------- - -%clean -%{__rm} -rf $RPM_BUILD_ROOT - -#--------------------------------------------------------------------- - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%files -f files.txt - -%files devel -f files-devel.txt - -#--------------------------------------------------------------------- - -%changelog -* Sun Jul 22 2012 Fedora Release Engineering - 2.0-3.20110406hg -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 2.0-2.20110406hg -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Apr 6 2011 Peter Robinson - 2.0-1.20110604hg -- update to latest HG snapshot to compile against xulrunner 2.0 - -* Tue Feb 08 2011 Fedora Release Engineering - 1.9.2-5.20100111hg -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Jul 26 2010 David Malcolm - 1.9.2-4.20100111hg -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Tue Mar 16 2010 Jan Horak - 1.9.2.3.20100111hg -- Set CFLAGS and CXXFLAGS variables to $RPM_OPT_FLAGS - -* Wed Nov 25 2009 Martin Stransky 1.9.2-2.20100111hg -- created as standalone package -