rpms/barcode/devel barcode-configure.patch, NONE, 1.1 barcode.spec, 1.1, 1.2

[Andreas Thienemann (ixs)]

Author: ixs

Update of /cvs/extras/rpms/barcode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6720

Modified Files:
	barcode.spec 
Added Files:
	barcode-configure.patch 
Log Message:
Fixed missing BuildRequire and a buildproblem on x86_64



barcode-configure.patch:

--- NEW FILE barcode-configure.patch ---
--- barcode-0.98/Makefile.in.orig	2005-07-07 23:07:48.513990181 +0200
+++ barcode-0.98/Makefile.in	2005-07-07 23:08:53.716905115 +0200
@@ -11,12 +11,12 @@
 LDFLAGS = -L. -l$(TARGET) @LIBPAPER@
 
 prefix = @prefix@
-BINDIR = $(prefix)/bin
-LIBDIR = $(prefix)/lib
-INCDIR = $(prefix)/include
-MAN1DIR = $(prefix)/man/man1
-MAN3DIR = $(prefix)/man/man3
-INFODIR = $(prefix)/info
+BINDIR = $(bindir)
+LIBDIR = $(libdir)
+INCDIR = $(includedir)
+MAN1DIR = $(mandir)/man1
+MAN3DIR = $(mandir)/man3
+INFODIR = $(infodir)
 
 # getopt may be installed or not, if not take our copy
 GETOPT_O = @GETOPT_O@


Index: barcode.spec
===================================================================
RCS file: /cvs/extras/rpms/barcode/devel/barcode.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- barcode.spec	7 Jul 2005 15:21:02 -0000	1.1
+++ barcode.spec	7 Jul 2005 21:43:59 -0000	1.2
@@ -1,16 +1,17 @@
 Summary: generates barcodes from text strings
 Name: barcode
 Version: 0.98
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/gnu/barcode/barcode-0.98.tar.gz
-Patch0: barcode-install-info.patch
+Patch0: barcode-configure.patch
+Patch1: barcode-install-info.patch
 URL: http://www.gnu.org/software/barcode/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(preun): /sbin/install-info
 Requires(post): /sbin/install-info
-BuildRequires: tetex, texinfo
+BuildRequires: tetex, tetex-dvips, texinfo, ghostscript
 
 %description
 Barcode is meant to solve most needs in barcode creation with a
@@ -30,25 +31,17 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .categories
+%patch0 -p1 -b .directories
+%patch1 -p1 -b .categories
 
 %build
 %configure
 make %{?_smp_mflags}
 
-# Regenerate documentation
-make -C doc barcode.info
-
 %install
 rm -rf %{buildroot}
 %makeinstall
 
-# Fix locations according to FHS
-mkdir -p %{buildroot}%{_mandir}
-mkdir -p %{buildroot}%{_infodir}
-mv %{buildroot}/usr/man/* %{buildroot}%{_mandir}
-mv %{buildroot}/usr/info/* %{buildroot}%{_infodir}
-
 %clean
 rm -rf %{buildroot}
 
@@ -74,6 +67,9 @@
 %{_mandir}/man3/barcode.3.gz
 
 %changelog
+* Thu Jul 07 2005 Andreas Thienemann <andreas at bawue.net> 0.98-6
+- Added configure patch to pick up correct libdir for x86_64
+
 * Thu Jul 07 2005 Andreas Thienemann <andreas at bawue.net> 0.98-5
 - Added install-info support to the texinfo file.
 - Fixed minor spec errors