rpms/nemiver/devel nemiver-make-libnemivercommon-global-lib.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 nemiver.spec, 1.9, 1.10 sources, 1.4, 1.5

Sat Apr 12 09:51:59 UTC 2008

Author: pgordon

Update of /cvs/pkgs/rpms/nemiver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2918

Modified Files:
	.cvsignore nemiver.spec sources 
Added Files:
	nemiver-make-libnemivercommon-global-lib.patch 
Log Message:
Update to 0.5.2, fix issue of devel subpackage not pulling in same-arch main pkg dependency.

nemiver-make-libnemivercommon-global-lib.patch:

--- NEW FILE nemiver-make-libnemivercommon-global-lib.patch ---
diff -up ./src/common/Makefile.in.old ./src/common/Makefile.in
--- ./src/common/Makefile.in.old	2008-04-12 01:38:45.000000000 -0700
+++ ./src/common/Makefile.in	2008-04-12 01:41:21.000000000 -0700
@@ -17,7 +17,7 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
@@ -327,7 +327,7 @@ target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 nemivercommon_LTLIBRARIES = libnemivercommon.la
-nemivercommondir = $(libdir)/nemiver
+nemivercommondir = $(libdir)
 headers = \
 nmv-api-macros.h \
 nmv-namespace.h \
@@ -392,7 +392,7 @@ nmv-proc-mgr.cc
 publicheaders_DATA = $(headers)
 publicheadersdir = $(NEMIVER_INCLUDE_DIR)/common
 libnemivercommon_la_LDFLAGS = @NEMIVERCOMMON_LIBS@ -lutil \
-		-avoid-version -rpath $(libdir)/nemiver
+		

 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libnemivercommon.pc
diff -up ./src/Makefile.in.old ./src/Makefile.in
--- ./src/Makefile.in.old	2008-04-12 01:23:43.000000000 -0700
+++ ./src/Makefile.in	2008-04-12 01:23:49.000000000 -0700
@@ -16,7 +16,7 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
diff -up ./Makefile.in.old ./Makefile.in
--- ./Makefile.in.old	2008-04-12 01:22:03.000000000 -0700
+++ ./Makefile.in	2008-04-12 01:22:08.000000000 -0700
@@ -16,7 +16,7 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)/
 pkgincludedir = $(includedir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Mar 2008 00:13:28 -0000	1.4
+++ .cvsignore	12 Apr 2008 09:51:23 -0000	1.5
@@ -1 +1 @@
-nemiver-0.5.1.tar.bz2
+nemiver-0.5.2.tar.bz2


Index: nemiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/devel/nemiver.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nemiver.spec	24 Mar 2008 00:13:28 -0000	1.9
+++ nemiver.spec	12 Apr 2008 09:51:23 -0000	1.10
@@ -1,5 +1,5 @@
 Name:		nemiver
-Version:	0.5.1
+Version:	0.5.2
 Release:	1%{?dist}
 Summary:	A C/C++ Debugger for GNOME - point, click, debug!
 
@@ -9,22 +9,25 @@
 
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.5/%{name}-%{version}.tar.bz2
 
+Patch0: 	%{name}-make-libnemivercommon-global-lib.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	libgtksourceviewmm-devel >= 0.3.0	
-BuildRequires:	gdb
 BuildRequires:	boost-devel
-BuildRequires:	gnome-vfs2-devel >= 2.14
-BuildRequires:	libgtop2-devel >= 2.14
-BuildRequires:	sqlite-devel >= 3.0
-BuildRequires:	vte-devel >= 0.12.0
-BuildRequires:	libglademm24-devel >= 2.6.0
 BuildRequires:	desktop-file-utils
+BuildRequires:	gdb
 BuildRequires:	gettext
-BuildRequires:	perl(XML::Parser)
+BuildRequires:	ghex-devel >= 2.21.4
 BuildRequires:	gnome-doc-utils >= 0.3.2
+BuildRequires:	gnome-vfs2-devel >= 2.14
+BuildRequires:	libglademm24-devel >= 2.6.0
 BuildRequires:	libgnome-devel >= 2.0
-BuildRequires:	ghex-devel >= 2.21.4
+BuildRequires:	libgtksourceviewmm-devel >= 0.3.0
+BuildRequires:	libgtop2-devel >= 2.14
+BuildRequires:	libtool
+BuildRequires:	perl(XML::Parser)
+BuildRequires:	sqlite-devel >= 3.0
+BuildRequires:	vte-devel >= 0.12.0
 
 Requires(pre):	GConf2
 
@@ -45,8 +48,10 @@
 Nemiver is an ongoing effort to write a standalone graphical debugger that
 integrates well in the GNOME desktop environment. It currently features a
 backend which uses the well known GNU Debugger (gdb) to debug C/C++ programs.
+
 The yelp package must be installed to make use of Nemiver's documentation.
 
+
 %package	devel
 Summary:	Development files for %{name}
 Group:		Development/Libraries
@@ -66,12 +71,14 @@
 
 %prep
 %setup -q
+%patch0 -b .make-libnemivercommon-global-lib 
 
 
 %build
 %configure --disable-static --disable-schemas-install		\
 	--disable-scrollkeeper
-make %{?_smp_mflags}
+# Use system libtool to prevent build scripts from using RPATH hacks.
+make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
 
 
 %install
@@ -125,10 +132,12 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING COPYRIGHT NEWS README TODO 
-%exclude %{_libdir}/%{name}/*.la
-%exclude %{_libdir}/%{name}/modules/*.la
+%exclude %{_libdir}/%{name}/modules/*.a
+%exclude %{_libdir}/*.a
+%exclude %{_libdir}/*.la
 %{_bindir}/%{name}
 %{_libdir}/%{name}/
+%{_libdir}/libnemivercommon.so.*
 %{_sysconfdir}/gconf/schemas/%{name}-*.schemas
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
@@ -140,11 +149,22 @@
 %files devel
 %defattr(-,root,root,-)
 %doc COPYING
+%{_libdir}/libnemivercommon.so
 %{_libdir}/pkgconfig/libnemivercommon.pc
 %{_includedir}/%{name}/
 
 
 %changelog
+* Fri Apr 11 2008 Peter Gordon <peter at thecodergeek.com> - 0.5.2-1
+- Update to new upstream release (0.5.2)
+- Add patch to keep the nemivercommon shared library in the global  %%_libdir,
+  rather that in a private directory therein. This allows other sources to
+  properly build against it without using nasty RPATH hacks, and also makes RPM
+  correctly add same-arch dependencies from the devel subpackage to the main
+  package via that unversioned binary symlink:
+  + make-libnemivercommon-global-lib.patch    
+- Alphabetize dependency list (aesthetic-only change)
+
 * Sat Mar 22 2008 Peter Gordon <peter at thecodergeek.com> - 0.5.1-1
 - Update to new upstream release (0.5.1)
 - Drop upstreamed GCC 4.3 and build-fix patches:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Mar 2008 00:13:28 -0000	1.4
+++ sources	12 Apr 2008 09:51:23 -0000	1.5
@@ -1 +1 @@
-46e1f52bebb25870e68bd9bb9d741c67  nemiver-0.5.1.tar.bz2
+b309771de1d15cc3820598f71cb5f8ee  nemiver-0.5.2.tar.bz2


