Nick Clifton cb347a
diff -up binutils-2.25.orig/bfd/Makefile.am binutils-2.25/bfd/Makefile.am
Nick Clifton cb347a
--- binutils-2.25.orig/bfd/Makefile.am	2014-12-24 10:28:10.546273213 +0000
Nick Clifton cb347a
+++ binutils-2.25/bfd/Makefile.am	2014-12-24 10:30:27.569042391 +0000
Nick Clifton cb347a
@@ -1025,8 +1025,8 @@ DISTCLEANFILES = $(BUILD_CFILES) $(BUILD
Nick Clifton cb347a
 bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in
Nick Clifton cb347a
 	@echo "creating $@"
Nick Clifton cb347a
 	@bfd_version=`echo "$(VERSION)" | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
Nick Clifton cb347a
-	bfd_version_string="\"$(VERSION)\"" ;\
Nick Clifton cb347a
-	bfd_soversion="$(VERSION)" ;\
Nick Clifton cb347a
+	bfd_version_string="\"$(VERSION)-%{release}\"" ;\
Nick Clifton cb347a
+	bfd_soversion="$(VERSION)-%{release}" ;\
Nick Clifton cb347a
 	bfd_version_package="\"$(PKGVERSION)\"" ;\
Nick Clifton cb347a
 	report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\
Nick Clifton cb347a
 	. $(srcdir)/development.sh ;\
Nick Clifton cb347a
@@ -1037,7 +1037,7 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/
Nick Clifton cb347a
 	fi ;\
Nick Clifton cb347a
 	sed -e "s,@bfd_version@,$$bfd_version," \
Nick Clifton cb347a
 	    -e "s,@bfd_version_string@,$$bfd_version_string," \
Nick Clifton cb347a
-	    -e "s,@bfd_version_package@,$$bfd_version_package," \
Nick Clifton cb347a
+	    -e "s,@bfd_version_package@,\"version \"," \
Nick Clifton cb347a
 	    -e "s,@report_bugs_to@,$$report_bugs_to," \
Nick Clifton cb347a
 	    < $(srcdir)/version.h > $@; \
Nick Clifton cb347a
 	echo "$${bfd_soversion}" > libtool-soversion
Nick Clifton cb347a
diff -up binutils-2.25.orig/bfd/Makefile.in binutils-2.25/bfd/Makefile.in
Nick Clifton cb347a
--- binutils-2.25.orig/bfd/Makefile.in	2014-12-24 10:28:10.558273280 +0000
Nick Clifton cb347a
+++ binutils-2.25/bfd/Makefile.in	2014-12-24 10:31:37.444434637 +0000
Nick Clifton cb347a
@@ -2085,8 +2085,8 @@ stmp-lcoff-h: $(LIBCOFF_H_FILES)
Nick Clifton cb347a
 bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in
Nick Clifton cb347a
 	@echo "creating $@"
Nick Clifton cb347a
 	@bfd_version=`echo "$(VERSION)" | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
Nick Clifton cb347a
-	bfd_version_string="\"$(VERSION)\"" ;\
Nick Clifton cb347a
-	bfd_soversion="$(VERSION)" ;\
Nick Clifton cb347a
+	bfd_version_string="\"$(VERSION)-%{release}\"" ;\
Nick Clifton cb347a
+	bfd_soversion="$(VERSION)-%{release}" ;\
Nick Clifton cb347a
 	bfd_version_package="\"$(PKGVERSION)\"" ;\
Nick Clifton cb347a
 	report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\
Nick Clifton cb347a
 	. $(srcdir)/development.sh ;\
Nick Clifton cb347a
@@ -2097,7 +2097,7 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/
Nick Clifton cb347a
 	fi ;\
Nick Clifton cb347a
 	sed -e "s,@bfd_version@,$$bfd_version," \
Nick Clifton cb347a
 	    -e "s,@bfd_version_string@,$$bfd_version_string," \
Nick Clifton cb347a
-	    -e "s,@bfd_version_package@,$$bfd_version_package," \
Nick Clifton cb347a
+	    -e "s,@bfd_version_package@,\"version \"," \
Nick Clifton cb347a
 	    -e "s,@report_bugs_to@,$$report_bugs_to," \
Nick Clifton cb347a
 	    < $(srcdir)/version.h > $@; \
Nick Clifton cb347a
 	echo "$${bfd_soversion}" > libtool-soversion
Nick Clifton cb347a