From 58a20cc2da4a819260b9a36d0a7c22613f68ac25 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 03:34:12 +0000 Subject: [PATCH 1/3] 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 e69b249876b57d74896ef38ad3194e16e9549c48 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 16 Mar 2010 07:50:46 +0000 Subject: [PATCH 2/3] 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 75123861147ab4899f4ef4f431642dc3dd248e51 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:16:11 +0000 Subject: [PATCH 3/3] 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