From 9e69c6dbb797831da523195c84937925015c3fa5 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 04:03:18 +0000 Subject: [PATCH 1/7] Initialize branch F-10 for python-chardet --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From 5fc36131e41b9cd30d816b19248c501038558f84 Mon Sep 17 00:00:00 2001 From: Kushal Das Date: Mon, 20 Apr 2009 06:07:03 +0000 Subject: [PATCH 2/7] Importing for F10 --- python-chardet.spec | 52 +++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 2 files changed, 53 insertions(+) create mode 100644 python-chardet.spec diff --git a/python-chardet.spec b/python-chardet.spec new file mode 100644 index 0000000..16f9be5 --- /dev/null +++ b/python-chardet.spec @@ -0,0 +1,52 @@ +# sitelib for noarch packages, sitearch for others (remove the unneeded one) +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + +Name: python-chardet +Version: 1.0.1 +Release: 1%{?dist} +Summary: Character encoding auto-detection in Python + +Group: Development/Languages +License: LGPLv2 +URL: http://chardet.feedparser.org +Source0: http://chardet.feedparser.org/download/chardet-%{version}.tgz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch +BuildRequires: python-devel, python-setuptools + +%description +Character encoding auto-detection in Python. As +smart as your browser. Open source. + +%prep +%setup -q -n chardet-%{version} + + + +%build +# Remove CFLAGS=... for noarch packages (unneeded) +%{__python} setup.py build + + +%install +rm -rf $RPM_BUILD_ROOT +%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +chmod -x COPYING + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc COPYING +# For noarch packages: sitelib +%{python_sitelib}/* + + +%changelog +* Mon Aug 04 2008 Kushal Das 1.0.1-1 +- Initial release + diff --git a/sources b/sources index e69de29..371cedf 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +f8c510a6fac300fe0ac9a0c24a76a7ba chardet-1.0.1.tgz From 18ae2d91c7e9ab160daf25f8f852478d5a6f0f98 Mon Sep 17 00:00:00 2001 From: Kushal Das Date: Mon, 20 Apr 2009 06:16:55 +0000 Subject: [PATCH 3/7] New spec --- python-chardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index 16f9be5..3dea017 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -4,7 +4,7 @@ Name: python-chardet Version: 1.0.1 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: Character encoding auto-detection in Python Group: Development/Languages @@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Apr 20 2008 Kushal Das 1.0.1-1.1 +- bumping the tag due worng cvs tag + * Mon Aug 04 2008 Kushal Das 1.0.1-1 - Initial release From a9118fca876fa438fd8046048ce062209a658812 Mon Sep 17 00:00:00 2001 From: Kushal Das Date: Mon, 20 Apr 2009 06:29:28 +0000 Subject: [PATCH 4/7] Fixed the wrong date in changelog --- python-chardet.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/python-chardet.spec b/python-chardet.spec index 3dea017..e2dd09f 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Apr 20 2009 Kushal Das 1.0.1-1.1 +- fixing changelog + * Mon Apr 20 2008 Kushal Das 1.0.1-1.1 - bumping the tag due worng cvs tag From 6006a06b6b10f39f1ff57d2a049d6a442b453100 Mon Sep 17 00:00:00 2001 From: Kushal Das Date: Mon, 20 Apr 2009 06:32:20 +0000 Subject: [PATCH 5/7] Removed that wrong changelog so that the package builds --- python-chardet.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/python-chardet.spec b/python-chardet.spec index e2dd09f..9bf3c0d 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -50,9 +50,6 @@ rm -rf $RPM_BUILD_ROOT * Mon Apr 20 2009 Kushal Das 1.0.1-1.1 - fixing changelog -* Mon Apr 20 2008 Kushal Das 1.0.1-1.1 -- bumping the tag due worng cvs tag - * Mon Aug 04 2008 Kushal Das 1.0.1-1 - Initial release From b353576a950dc83fe5c374f4e2fe29d7255d2af6 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:50:25 +0000 Subject: [PATCH 6/7] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6b7cfc1..90baab2 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := python-chardet 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 $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +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)) From 1bda5ea3bd917e79235248c317c06b58ebb66217 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 10:14:17 +0000 Subject: [PATCH 7/7] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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 90baab2..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: python-chardet -# $Id$ -NAME := python-chardet -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 dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10