From c93c36702eacfd705f00fe084b26348740f9aae9 Mon Sep 17 00:00:00 2001 From: Peter Gordon Date: Jun 28 2008 00:08:52 +0000 Subject: Update to 0.5.4; rename nemiver-devel => nemiver-headers; drop unnecessary patch. --- diff --git a/.cvsignore b/.cvsignore index b0de747..67ae589 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -nemiver-0.5.3.tar.bz2 +nemiver-0.5.4.tar.bz2 diff --git a/nemiver-make-libnemivercommon-global-lib.patch b/nemiver-make-libnemivercommon-global-lib.patch deleted file mode 100644 index 94adf61..0000000 --- a/nemiver-make-libnemivercommon-global-lib.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -up ./src/common/Makefile.in.old ./src/common/Makefile.in ---- ./src/common/Makefile.in.old 2008-05-26 14:28:03.000000000 -0700 -+++ ./src/common/Makefile.in 2008-05-26 14:29:09.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 -@@ -335,7 +335,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 \ -@@ -400,7 +400,6 @@ nmv-proc-mgr.cc - publicheaders_DATA = $(headers) - publicheadersdir = $(NEMIVER_INCLUDE_DIR)/common - libnemivercommon_la_LDFLAGS = @NEMIVERCOMMON_LIBS@ -lutil \ -- -avoid-version -rpath $(libdir)/nemiver \ - -Wl,--as-needed - - pkgconfigdir = $(libdir)/pkgconfig -diff -up ./src/Makefile.in.old ./src/Makefile.in ---- ./src/Makefile.in.old 2008-05-26 14:29:22.000000000 -0700 -+++ ./src/Makefile.in 2008-05-26 14:29:27.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-05-26 14:29:37.000000000 -0700 -+++ ./Makefile.in 2008-05-26 14:29:43.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 --git a/nemiver.spec b/nemiver.spec index 768c89e..1a559de 100644 --- a/nemiver.spec +++ b/nemiver.spec @@ -1,5 +1,5 @@ Name: nemiver -Version: 0.5.3 +Version: 0.5.4 Release: 1%{?dist} Summary: A C/C++ Debugger for GNOME - point, click, debug! @@ -9,18 +9,18 @@ URL: http://home.gna.org/nemiver/ Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.5/%{name}-%{version}.tar.bz2 -## https://bugzilla.gnome.org/show_bug.cgi?id=534990 -Patch0: %{name}-make-libnemivercommon-global-lib.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +## The glibmm bits would normally be part of the dependency tree for +## gtksourceviewmm; but we're using GIO here (F9+) so we need to ensure that the +## the Glib/glibmm we're depending on also includes it (e.g., 2.16+) BuildRequires: boost-devel BuildRequires: desktop-file-utils BuildRequires: gdb BuildRequires: gettext BuildRequires: ghex-devel >= 2.21.4 +BuildRequires: glibmm24-devel >= 2.16 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: libgtksourceviewmm-devel >= 0.3.0 @@ -53,26 +53,24 @@ 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} +%package headers +Summary: Header files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: pkgconfig -## Needs these for the various #include directives in its headers, as well -## as pkgconfig dependencies... +## Needs these for the various #include directives in its headers... Requires: boost-devel -Requires: glibmm24-devel >= 2.8.5 +Requires: glibmm24-devel >= 2.16 Requires: libxml2-devel >= 2.6.22 -Requires: gnome-vfs2-devel >= 2.14 -%description devel -The %{name}-devel package contains libraries and header files for -developing applications that use %{name}. +Obsoletes: %{name}-devel < 0.5.4-1 + +%description headers +The %{name}-headers package contains header files for developing new debugging +backends for Nemiver. %prep %setup -q -%patch0 -b .make-libnemivercommon-global-lib %build @@ -133,12 +131,12 @@ scrollkeeper-update -q ||: %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING COPYRIGHT NEWS README TODO +%exclude %{_libdir}/%{name}/*.a +%exclude %{_libdir}/%{name}/*.la %exclude %{_libdir}/%{name}/modules/*.a -%exclude %{_libdir}/*.a -%exclude %{_libdir}/*.la +%exclude %{_libdir}/%{name}/modules/*.la %{_bindir}/%{name} %{_libdir}/%{name}/ -%{_libdir}/libnemivercommon.so.* %{_sysconfdir}/gconf/schemas/%{name}-*.schemas %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.* @@ -147,15 +145,24 @@ scrollkeeper-update -q ||: %{_datadir}/gnome/help/%{name}/ %{_mandir}/man?/%{name}.* -%files devel +%files headers %defattr(-,root,root,-) %doc COPYING -%{_libdir}/libnemivercommon.so -%{_libdir}/pkgconfig/libnemivercommon.pc %{_includedir}/%{name}/ %changelog +* Fri Jun 27 2008 Peter Gordon - 0.5.4-1 +- Update to new upstream release (0.5.4) +- Rename -devel subpackage to -headers and adjust the %%description + accordingly. (It no longer contains any shared library symlinks or pkgconfig + data; and thus would not be multilib-friendly. We can't put it in the main + package due to its additional *-devel dependencies. Finally, upstream has + said that nothing should really be using the libnemivercommon API yet + anyway.) +- Drop the libnemiver global library patch (fixed upstream)L + - make-libnemivercommon-global-lib.patch + * Mon May 26 2008 Peter Gordon - 0.5.3-1 - Update to new upstream release (0.5.3) - Add upstream bug reference for make-libnemivercommon-global-lib patch. diff --git a/sources b/sources index 779ad54..c570474 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -27a40f6dee264053ea70db344944a967 nemiver-0.5.3.tar.bz2 +5fa4df82e74810053c91fac121617190 nemiver-0.5.4.tar.bz2