commit f64a0dc2cb5ffb0756fb32c47722d831ddb0319f
Author: Jakub Bogusz <[email protected]>
Date: Mon Apr 11 19:39:47 2022 +0200
- updated dependencies (libgtkhex-3 is in gtkhex3 package now)
- added ac,pc patches (fixes for autoconf and .pc file)
- spec cleanups, release 2
nemiver-ac.patch | 13 +++++++++++++
nemiver-pc.patch | 10 ++++++++++
nemiver.spec | 54 +++++++++++++++++++++++++++++++-----------------------
3 files changed, 54 insertions(+), 23 deletions(-)
---
diff --git a/nemiver.spec b/nemiver.spec
index fcd2f52..2f124ca 100644
--- a/nemiver.spec
+++ b/nemiver.spec
@@ -2,14 +2,16 @@ Summary: C/C++ debugger for GNOME
Summary(pl.UTF-8): Debugger C/C++ dla GNOME
Name: nemiver
Version: 0.9.6
-Release: 1
-License: GPL
+Release: 2
+License: GPL v2+
Group: X11/Applications
-Source0:
http://ftp.gnome.org/pub/GNOME/sources/nemiver/0.9/%{name}-%{version}.tar.xz
+Source0:
https://download.gnome.org/sources/nemiver/0.9/%{name}-%{version}.tar.xz
# Source0-md5: cf33f0eef4f392268a2bdf103e930bd3
Patch0: 0001-Fix-compiliation-warnings-errors.patch
Patch1: 0001-Use-RefPtr-bool-operator-in-the-conditions.patch
-URL: http://home.gna.org/nemiver/
+Patch2: %{name}-ac.patch
+Patch3: %{name}-pc.patch
+URL: https://wiki.gnome.org/Apps/Nemiver
BuildRequires: autoconf >= 2.64
BuildRequires: automake >= 1:1.11.1
BuildRequires: boost-devel >= 1.35.0
@@ -17,29 +19,35 @@ BuildRequires: docbook-dtd412-xml
# gdlmm for dynamic layout
BuildRequires: gdlmm-devel >= 3.2
BuildRequires: gettext-tools >= 0.17
-BuildRequires: ghex-devel >= 3.0.0
+BuildRequires: gtkhex3-devel >= 3.0.0
+BuildRequires: glib2-devel >= 1:2.14
BuildRequires: glibmm-devel >= 2.25.1
-BuildRequires: gnome-doc-utils >= 0.14.0
BuildRequires: gsettings-desktop-schemas-devel
-BuildRequires: gtkmm-devel >= 2.12.0
-BuildRequires: gtksourceviewmm3-devel
+BuildRequires: gtk+3-devel >= 3.0
+BuildRequires: gtkmm3-devel >= 3.0
+BuildRequires: gtksourceviewmm3-devel >= 3.0
BuildRequires: intltool >= 0.40.0
BuildRequires: itstool
BuildRequires: libgtop-devel >= 2.14.0
+BuildRequires: libstdc++-devel >= 6:4.7
BuildRequires: libtool >= 2:2.2
BuildRequires: libxml2-devel >= 1:2.6.31
BuildRequires: pkgconfig
BuildRequires: rpmbuild(find_lang) >= 1.23
BuildRequires: rpmbuild(macros) >= 1.311
BuildRequires: sqlite3-devel >= 3.0
+BuildRequires: tar >= 1:1.22
BuildRequires: vte-devel >= 0.38.0
+BuildRequires: xz
BuildRequires: yelp-tools
Requires(post,postun): glib2 >= 1:2.26.0
Requires(post,postun): gtk-update-icon-cache
-Requires(post,postun): hicolor-icon-theme
-Requires(post,postun): scrollkeeper
Requires: gdb
-Requires: gtkmm >= 2.18
+Requires: gdlmm >= 3.2
+Requires: glib2 >= 1:2.14
+Requires: glibmm >= 2.25.1
+Requires: hicolor-icon-theme
+Requires: libxml2 >= 1:2.6.31
Obsoletes: nemiver-libs < 0.5.3
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -59,10 +67,11 @@ programów w C/C++.
Summary: Header files for Nemiver
Summary(pl.UTF-8): Pliki nagłówkowe Nemivera
Group: X11/Development/Libraries
-Requires: glibmm-devel >= 2.16.0
+Requires: glib2-devel >= 1:2.14
+Requires: glibmm-devel >= 2.25.1
Requires: libgtop-devel >= 2.14.0
Requires: libxml2-devel >= 1:2.6.31
-Obsoletes: nemiver-static
+Obsoletes: nemiver-static < 0.6.3
%description devel
Header files for developing new debugging backends for Nemiver.
@@ -74,6 +83,7 @@ Pliki nagłówkowe do rozwijania nowych backendów dla Nemivera.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%{__glib_gettextize}
@@ -88,7 +98,7 @@ Pliki nagłówkowe do rozwijania nowych backendów dla Nemivera.
--disable-schemas-install \
--disable-silent-rules \
--disable-static \
- --enable-gsettings=yes
+ --enable-gsettings
%{__make}
%install
@@ -97,33 +107,31 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/nemiver/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/nemiver/modules/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/nemiver/plugins/dbgperspective/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/nemiver/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/nemiver/modules/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/nemiver/plugins/dbgperspective/*.la
-%find_lang %{name} --with-gnome --with-omf
+%find_lang %{name} --with-gnome
%clean
rm -rf $RPM_BUILD_ROOT
%post
%glib_compile_schemas
-%scrollkeeper_update_post
%update_icon_cache hicolor
%postun
%glib_compile_schemas
-%scrollkeeper_update_postun
%update_icon_cache hicolor
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README TODO
+%doc AUTHORS COPYRIGHT ChangeLog NEWS README TODO
%attr(755,root,root) %{_bindir}/nemiver
%{_datadir}/nemiver
%{_desktopdir}/nemiver.desktop
-%{_iconsdir}/hicolor/*/apps/nemiver.png
-%{_iconsdir}/hicolor/*/apps/nemiver.svg
+%{_iconsdir}/hicolor/*x*/apps/nemiver.png
+%{_iconsdir}/hicolor/scalable/apps/nemiver.svg
%{_iconsdir}/hicolor/symbolic/apps/nemiver-symbolic.svg
%{_datadir}/glib-2.0/schemas/org.nemiver.gschema.xml
%{_datadir}/appdata/nemiver.appdata.xml
diff --git a/nemiver-ac.patch b/nemiver-ac.patch
new file mode 100644
index 0000000..5f04a0b
--- /dev/null
+++ b/nemiver-ac.patch
@@ -0,0 +1,13 @@
+--- nemiver-0.9.6/configure.ac.orig 2015-09-23 20:07:09.000000000 +0200
++++ nemiver-0.9.6/configure.ac 2022-04-11 16:24:07.301790363 +0200
+@@ -230,8 +230,9 @@ AC_ARG_ENABLE(gsettings,
+ AS_HELP_STRING([--enable-gsettings=yes|no],
+ [use gsettings instead of gconf (default is
auto)]),
+ ENABLE_GSETTINGS=$enableval,
++ [
+ AC_CHECK_PROG([HAS_DCONF], [dconf], [yes], [no])
+- [PKG_CHECK_EXISTS([giomm-2.4 >=
$LIBGIOMM_WITH_GSETTINGS_VERSION gsettings-desktop-schemas >=
$GSETTINGS_DESKTOP_SCHEMAS], [HAS_GSETTINGS=yes], [HAS_GSETTINGS=no])])
++ PKG_CHECK_EXISTS([giomm-2.4 >= $LIBGIOMM_WITH_GSETTINGS_VERSION
gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS], [HAS_GSETTINGS=yes],
[HAS_GSETTINGS=no])])
+ if test x$ENABLE_GSETTINGS = xyes || (test x$ENABLE_GSETTINGS = xauto \
+ && test x$HAS_GSETTINGS = xyes \
+ && test x$HAS_DCONF = xyes); then
diff --git a/nemiver-pc.patch b/nemiver-pc.patch
new file mode 100644
index 0000000..218646e
--- /dev/null
+++ b/nemiver-pc.patch
@@ -0,0 +1,10 @@
+--- nemiver-0.9.6/src/common/libnemivercommon.pc.in.orig 2013-01-21
13:05:35.000000000 +0100
++++ nemiver-0.9.6/src/common/libnemivercommon.pc.in 2022-04-11
19:16:11.539192501 +0200
+@@ -6,6 +6,6 @@ includedir=@NEMIVER_INCLUDE_DIR@
+ Name: libnemivercommon
+ Description: Common infrastructure for the Nemiver debugger and library
+ Version: @VERSION@
+-Requires: libxml-2.0 >= @LIBXML2_VERSION@, glibmm-2.4 >= @LIBGLIBMM_VERSION@,
gnome-vfs-2.0 >= @LIBGNOMEVFS_VERSION@, gmodule-2.0 >= @LIBGMODULE_VERSION@,
gthread-2.0 >= @LIBGTHREAD_VERSION@, libgtop-2.0 >= @LIBGTOP_VERSION@
++Requires: libxml-2.0 >= @LIBXML2_VERSION@, glibmm-2.4 >= @LIBGLIBMM_VERSION@,
gmodule-2.0 >= @LIBGMODULE_VERSION@, gthread-2.0 >= @LIBGTHREAD_VERSION@,
libgtop-2.0 >= @LIBGTOP_VERSION@
+ Libs: -L${libdir} -lnemivercommon
+ Cflags: -I${includedir}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nemiver.git/commitdiff/f64a0dc2cb5ffb0756fb32c47722d831ddb0319f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
