rpms/gpart/devel gpart-0.1h-makefile.patch, NONE, 1.1 gpart.spec, 1.8, 1.9

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sun Feb 4 03:08:02 UTC 2007


Author: dcantrel

Update of /cvs/dist/rpms/gpart/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14383

Modified Files:
	gpart.spec 
Added Files:
	gpart-0.1h-makefile.patch 
Log Message:
* Sat Feb 03 2007 David Cantrell <dcantrell at redhat.com> - 0.1h-5
- Fix spec file problems with merge review (#225853)


gpart-0.1h-makefile.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gpart-0.1h-makefile.patch ---
--- gpart-0.1h/src/Makefile.makefile	2001-01-30 12:01:08.000000000 -0500
+++ gpart-0.1h/src/Makefile	2007-02-03 22:04:49.000000000 -0500
@@ -33,7 +33,7 @@
 
 install: $(prg)
 	$(INSTALL) -d $(bindir)
-	$(INSTALL) -s $(prg) $(bindir)
+	$(INSTALL) $(prg) $(bindir)
 
 uninstall:
 	$(RM) $(bindir)/$(prg)


Index: gpart.spec
===================================================================
RCS file: /cvs/dist/rpms/gpart/devel/gpart.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gpart.spec	22 Oct 2006 18:57:34 -0000	1.8
+++ gpart.spec	4 Feb 2007 03:07:59 -0000	1.9
@@ -1,17 +1,19 @@
-Summary:  A program for recovering corrupt partition tables.
+Summary:  A program for recovering corrupt partition tables
 Name: gpart
 Version: 0.1h
-Release: 4%{?dist}
+Release: 5%{?dist}
 ExclusiveArch: i386
+URL: http://www.stud.uni-hannover.de/user/76201/gpart/
 Source: http://www.stud.uni-hannover.de/user/76201/%{name}/%{name}-%{version}.tar.gz
 Patch0: gpart-0.1h-varname.patch
 Patch1: gpart-0.1h-cflags.patch
 Patch2: gpart-0.1h-errno.patch
 Patch3: gpart-0.1h-syscall.patch
 Patch4: gpart-0.1h-largefile.patch
+Patch5: gpart-0.1h-makefile.patch
 BuildRequires: glibc-kernheaders
 
-Buildroot: %{_tmppath}/%{name}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPL
 Group: Applications/System
 
@@ -26,13 +28,14 @@
 %patch2 -p1 -b .errno
 %patch3 -p1 -b .syscall
 %patch4 -p1 -b .largefile
+%patch5 -p1 -b .makefile
 
 %build
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make bindir=${RPM_BUILD_ROOT}/usr/bin mandir=${RPM_BUILD_ROOT}/usr/share/man install
+%makeinstall
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -44,6 +47,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Sat Feb 03 2007 David Cantrell <dcantrell at redhat.com> - 0.1h-5
+- Fix spec file problems with merge review (#225853)
+
 * Sun Oct 22 2006 David Cantrell <dcantrell at redhat.com> - 0.1h-4
 - Compile with large file support (#211746)
 




More information about the fedora-cvs-commits mailing list