From e21a65360ca85857dd2139593c9b7748f53803e0 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:50:25 +0000 Subject: [PATCH 1/5] 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 8352c230c8bedd77932e51ec98daf6fd64fda475 Mon Sep 17 00:00:00 2001 From: Kushal Das Date: Wed, 7 Apr 2010 10:08:39 +0000 Subject: [PATCH 2/5] Updating to new release of 2.0.1 --- python-chardet.spec | 13 +++++++------ sources | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/python-chardet.spec b/python-chardet.spec index d044d26..22b1eb6 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,16 +1,14 @@ -# 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: 2%{?dist} +Version: 2.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 +Source0: http://chardet.feedparser.org/download/python2-chardet-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -21,7 +19,7 @@ Character encoding auto-detection in Python. As smart as your browser. Open source. %prep -%setup -q -n chardet-%{version} +%setup -q -n python2-chardet-%{version} @@ -47,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jan 13 2010 Kushal Das 2.0.1-1 +- New release + * Sun Jul 26 2009 Fedora Release Engineering - 1.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 371cedf..6ba688c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f8c510a6fac300fe0ac9a0c24a76a7ba chardet-1.0.1.tgz +ec771971bab5dd1943a10362ebd2fd4c python2-chardet-2.0.1.tgz From e931c73e2e27257400695112fb28b1c5b369c0e5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 02:17:45 +0000 Subject: [PATCH 3/5] Initialize branch EL-6 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..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From 9fc7439fd9ccf298589be7f4a027ab93ca214b56 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 10:14:18 +0000 Subject: [PATCH 4/5] 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 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 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 diff --git a/import.log b/import.log deleted file mode 100644 index e1d33c6..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -python-chardet-1_0_1-1_fc9:HEAD:python-chardet-1.0.1-1.fc9.src.rpm:1239526287 From cf9c29153af534fc407712f42d629be3eccf0dbb Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 28 Sep 2015 15:04:59 -0600 Subject: [PATCH 5/5] package added into rhel in rhel6.7 --- .gitignore | 1 - dead.package | 1 + python-chardet.spec | 56 --------------------------------------------- sources | 1 - 4 files changed, 1 insertion(+), 58 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 python-chardet.spec delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 339d719..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -chardet-1.0.1.tgz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..07e3747 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +package added into rhel in rhel6.7 diff --git a/python-chardet.spec b/python-chardet.spec deleted file mode 100644 index 22b1eb6..0000000 --- a/python-chardet.spec +++ /dev/null @@ -1,56 +0,0 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - -Name: python-chardet -Version: 2.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/python2-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 python2-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 -* Wed Jan 13 2010 Kushal Das 2.0.1-1 -- New release - -* Sun Jul 26 2009 Fedora Release Engineering - 1.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Mon Aug 04 2008 Kushal Das 1.0.1-1 -- Initial release - diff --git a/sources b/sources deleted file mode 100644 index 6ba688c..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -ec771971bab5dd1943a10362ebd2fd4c python2-chardet-2.0.1.tgz