rpms/yum-arch/devel yum-arch-folder.patch, NONE, 1.1 yum-arch.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Remi Collet (remi) fedora-extras-commits at redhat.com
Tue Feb 20 16:09:44 UTC 2007


Author: remi

Update of /cvs/extras/rpms/yum-arch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29355/devel

Modified Files:
	.cvsignore sources 
Added Files:
	yum-arch-folder.patch yum-arch.spec 
Log Message:
auto-import yum-arch-2.2.2-2.fc7 on branch devel from yum-arch-2.2.2-2.fc7.src.rpm

yum-arch-folder.patch:

--- NEW FILE yum-arch-folder.patch ---
--- ./docs/Makefile.remi	2004-10-13 07:36:58.000000000 +0200
+++ ./docs/Makefile	2007-02-16 17:11:37.000000000 +0100
@@ -5,7 +5,5 @@
 	rm -f *.pyc *.pyo *~
 
 install:
-	mkdir -p $(DESTDIR)/usr/share/man/man{5,8}
-	install -m 644 yum.8 $(DESTDIR)/usr/share/man/man8/yum.8
+	mkdir -p $(DESTDIR)/usr/share/man/man8
 	install -m 644 yum-arch.8 $(DESTDIR)/usr/share/man/man8/yum-arch.8
-	install -m 644 yum.conf.5 $(DESTDIR)/usr/share/man/man5/yum.conf.5
--- ./yum/Makefile.remi	2004-08-31 06:20:04.000000000 +0200
+++ ./yum/Makefile	2007-02-16 17:11:37.000000000 +0100
@@ -3,7 +3,7 @@
 PYVER := $(shell python -c 'import sys; print "%.3s" %(sys.version)')
 PYSYSDIR := $(shell python -c 'import sys; print sys.prefix')
 PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER)
-PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE)
+PKGDIR = /usr/share/yum-arch/$(PACKAGE)
 
 all: 
 	echo "Nothing to do"
--- ./repomd/Makefile.remi	2004-08-31 06:20:03.000000000 +0200
+++ ./repomd/Makefile	2007-02-16 17:11:37.000000000 +0100
@@ -3,7 +3,7 @@
 PYVER := $(shell python -c 'import sys; print "%.3s" %(sys.version)')
 PYSYSDIR := $(shell python -c 'import sys; print sys.prefix')
 PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER)
-PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE)
+PKGDIR = /usr/share/yum-arch/$(PACKAGE)
 
 all: 
 	echo "Nothing to do"
--- ./bin/yum-arch.remi	2004-10-13 07:57:34.000000000 +0200
+++ ./bin/yum-arch	2007-02-16 17:11:37.000000000 +0100
@@ -18,6 +18,6 @@
 
 import sys
 
-sys.path.insert(1,'/usr/share/yum-cli')
+sys.path.insert(0,'/usr/share/yum-arch')
 import pullheaders
 pullheaders.main(sys.argv[1:])
--- ./Makefile.remi	2005-01-25 06:56:43.000000000 +0100
+++ ./Makefile	2007-02-16 17:13:59.000000000 +0100
@@ -1,4 +1,4 @@
-SUBDIRS = repomd rpmUtils urlgrabber yum etc docs
+SUBDIRS = repomd rpmUtils urlgrabber yum docs
 PYFILES = $(wildcard *.py)
 
 PKGNAME = yum
@@ -17,14 +17,13 @@
 	for d in $(SUBDIRS); do make -C $$d; [ $$? = 0 ] || exit 1 ; done
 
 install:
-	mkdir -p $(DESTDIR)/usr/share/yum-cli
+	mkdir -p $(DESTDIR)/usr/share/yum-arch
 	for p in $(PYFILES) ; do \
-		install -m 644 $$p $(DESTDIR)/usr/share/yum-cli/$$p; \
+		install -m 644 $$p $(DESTDIR)/usr/share/yum-arch/$$p; \
 	done
-	$(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/usr/share/yum-cli', 1, '$(PYDIR)', 1)"
+	$(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/usr/share/yum-arch', 1, '$(PYDIR)', 1)"
 
 	mkdir -p $(DESTDIR)/usr/bin $(DESTDIR)/usr/bin
-	install -m 755 bin/yum.py $(DESTDIR)/usr/bin/yum
 	install -m 755 bin/yum-arch $(DESTDIR)/usr/bin/yum-arch
 
 	mkdir -p $(DESTDIR)/var/cache/yum
--- ./urlgrabber/Makefile.remi	2004-08-31 06:20:04.000000000 +0200
+++ ./urlgrabber/Makefile	2007-02-16 17:11:37.000000000 +0100
@@ -3,7 +3,7 @@
 PYVER := $(shell python -c 'import sys; print "%.3s" %(sys.version)')
 PYSYSDIR := $(shell python -c 'import sys; print sys.prefix')
 PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER)
-PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE)
+PKGDIR = /usr/share/yum-arch/$(PACKAGE)
 
 all: 
 	echo "Nothing to do"
--- ./rpmUtils/Makefile.remi	2004-08-31 06:20:03.000000000 +0200
+++ ./rpmUtils/Makefile	2007-02-16 17:11:37.000000000 +0100
@@ -3,7 +3,7 @@
 PYVER := $(shell python -c 'import sys; print "%.3s" %(sys.version)')
 PYSYSDIR := $(shell python -c 'import sys; print sys.prefix')
 PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER)
-PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE)
+PKGDIR = /usr/share/yum-arch/$(PACKAGE)
 
 all: 
 	echo "Nothing to do"


--- NEW FILE yum-arch.spec ---
Summary:  Extract headers from rpm in a old yum repository
Name:     yum-arch
Version:  2.2.2
Release:  2%{?dist}
License:  GPL
Group:    System Environment/Base
Source0:  http://linux.duke.edu/projects/yum/download/2.2/yum-%{version}.tar.gz
Patch1:   yum-arch-folder.patch
URL:      http://linux.duke.edu/yum/

BuildArch: noarch
BuildRequires: python, gettext

Requires:  python, rpm-python, rpm >= 0:4.1.1, libxml2-python
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Extract headers from rpm in a old yum repository.

This package only provides the old yum-arch command from yum-%{version}
It should be used to generate repository informations for Fedora Core  < 3
and RedHat Enterprise Linux < 4.

%prep
%setup -q -n yum-%{version}
%patch1 -p0 -b .folder

# to avoid rpmlint warnings
for source in *.py {repomd,rpmUtils,yum}/*.py; do
    sed -i -e '/^#!\/usr/d' $source
done

%build
make

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-, root, root, -)
%doc README AUTHORS COPYING TODO INSTALL ChangeLog
%{_datadir}/%{name}
%{_bindir}/%{name}
%{_mandir}/man8/%{name}*

%changelog
* Sun Feb 18 2007 Remi Collet <Fedora at FamilleCollet.com> - 2.2.2-2
- from package review (#229123) 
  own /usr/share/yum-arch
  del shellbang in libs

* Sat Feb 17 2007 Remi Collet <Fedora at FamilleCollet.com> - 2.2.2-1
- initial spec for Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yum-arch/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Feb 2007 01:24:25 -0000	1.1
+++ .cvsignore	20 Feb 2007 16:09:11 -0000	1.2
@@ -0,0 +1 @@
+yum-2.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yum-arch/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Feb 2007 01:24:25 -0000	1.1
+++ sources	20 Feb 2007 16:09:11 -0000	1.2
@@ -0,0 +1 @@
+734cc68e26c2fd07629616ab597acac6  yum-2.2.2.tar.gz




More information about the fedora-extras-commits mailing list