diff --git a/.cvsignore b/.gitignore similarity index 50% rename from .cvsignore rename to .gitignore index 62039d2..784c7c4 100644 --- a/.cvsignore +++ b/.gitignore @@ -1 +1,2 @@ pyxpcom-1.9.2-20100111hg.tar.bz2 +/pyxpcom-2.0-20110406hg.tar.bz2 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/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/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 diff --git a/sources b/sources deleted file mode 100644 index 151eb36..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -bc5b5d794ff2f79150f67dea7519a6f5 pyxpcom-1.9.2-20100111hg.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 a8669f5..0000000 --- a/xulrunner-python.spec +++ /dev/null @@ -1,126 +0,0 @@ -%define builddir %{_builddir}/%{name}-%{version} -%define objdir objdir -%define hgver 20100111hg - -Summary: Python interface for mozilla XPCOM library -Name: xulrunner-python -Version: 1.9.2 -Release: 2.%{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 -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 -%patch0 -p1 -b .dynstr - -mkdir %{objdir} -autoconf-2.13 - -#--------------------------------------------------------------------- - -%build -cd %{objdir} -../configure --with-libxul-sdk=`pkg-config --variable=sdkdir libxul` \ - --with-system-nspr \ - --prefix=%{_prefix} \ - --libdir=%{_libdir} -make - -#--------------------------------------------------------------------- - -%install -%{__rm} -rf $RPM_BUILD_ROOT - -# 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 -* Wed Nov 25 2009 Martin Stransky 1.9.2-2.20100111hg -- created as standalone package -