[packages/gnome-builder] up to 3.36.2, files need update
baggins
baggins at pld-linux.org
Sun Nov 26 18:33:45 CET 2017
commit 5512e48b6e2b9f713aacfb330d79e7fd48c3acc7
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Nov 26 18:33:27 2017 +0100
up to 3.36.2, files need update
gnome-builder-link.patch | 11 ----
gnome-builder.spec | 145 +++++++++++++++++++++++------------------------
2 files changed, 70 insertions(+), 86 deletions(-)
---
diff --git a/gnome-builder.spec b/gnome-builder.spec
index f124167..fe60842 100644
--- a/gnome-builder.spec
+++ b/gnome-builder.spec
@@ -3,24 +3,22 @@
#
# Conditional build:
%bcond_without sysprof # sysprof system profiler plugin
+%bcond_with vala # vala pack plugin
#
Summary: IDE for writing GNOME-based software
Summary(pl.UTF-8): IDE do tworzenia oprogramowania opartego na GNOME
Name: gnome-builder
-Version: 3.24.2
-Release: 2
+Version: 3.26.2
+Release: 0.1
License: GPL v3+
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-builder/3.24/%{name}-%{version}.tar.xz
-# Source0-md5: 2201cc0d0356328f1b2be22139f9d511
-Patch0: %{name}-link.patch
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-builder/3.26/%{name}-%{version}.tar.xz
+# Source0-md5: d330eec265267651c287fb19e4dc7ade
URL: https://wiki.gnome.org/Apps/Builder
BuildRequires: appstream-glib-devel
-BuildRequires: autoconf >= 2.69
-BuildRequires: automake >= 1:1.11
BuildRequires: clang-devel >= 3.5
BuildRequires: desktop-file-utils
-BuildRequires: devhelp-devel >= 3.20.0
+BuildRequires: devhelp-devel >= 3.26.0
BuildRequires: enchant-devel >= 1.6.0
BuildRequires: flatpak-devel >= 0.8.0
# -std=gnu11 for C
@@ -36,14 +34,17 @@ BuildRequires: gtk-webkit4-devel >= 2.12.0
BuildRequires: gtksourceview3-devel >= 3.22.0
BuildRequires: intltool >= 0.50.1
BuildRequires: json-glib-devel >= 1.2.0
+BuildRequires: jsonrpc-glib-devel
BuildRequires: libgit2-glib-devel >= 0.25.0
-BuildRequires: libpeas-devel >= 1.18.0
+BuildRequires: libpeas-devel >= 1.22.0
BuildRequires: libsoup-devel >= 2.52.0
# C++11
BuildRequires: libstdc++-devel >= 6:4.7
BuildRequires: libtool >= 2:2.2
BuildRequires: libxml2-devel >= 1:2.9.0
BuildRequires: llvm-devel >= 3.5
+BuildRequires: meson
+BuildRequires: ninja
BuildRequires: pango-devel >= 1:1.38.0
BuildRequires: pcre-devel
BuildRequires: pkgconfig >= 1:0.22
@@ -52,15 +53,18 @@ BuildRequires: python3-pygobject3-devel >= 3.22.0
BuildRequires: rpmbuild(macros) >= 1.522
%{?with_sysprof:BuildRequires: sysprof-ui-devel >= 3.23.91}
BuildRequires: tar >= 1:1.22
+%if %{with vala}
BuildRequires: vala >= 2:0.30.0.55
+BuildRequires: vala-jsonrpc-glib
BuildRequires: vala-libgit2-glib >= 0.24.0
+%endif
BuildRequires: vte-devel >= 0.46
BuildRequires: xz
BuildRequires: yelp-tools
Requires(post,postun): glib2 >= 1:2.50.0
Requires(post,postun): gtk-update-icon-cache
Requires: ctags
-Requires: devhelp-libs >= 3.20.0
+Requires: devhelp-libs >= 3.26.0
Requires: enchant >= 1.6.0
Requires: flatpak-libs >= 0.6.9
Requires: gjs >= 1.42.0
@@ -71,7 +75,7 @@ Requires: gtksourceview3 >= 3.22.0
Requires: hicolor-icon-theme
Requires: json-glib >= 1.2.0
Requires: libgit2-glib >= 0.24.0
-Requires: libpeas >= 1.18.0
+Requires: libpeas >= 1.22.0
Requires: libsoup >= 2.52.0
Requires: libxml2 >= 1:2.9.0
Requires: pango >= 1:1.38.0
@@ -132,31 +136,18 @@ API języka Vala dla GNOME Buildera.
%prep
%setup -q
-%patch0 -p1
%build
-%{__libtoolize}
-%{__aclocal} -I build/autotools
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
- --disable-silent-rules \
- --disable-static \
- %{!?with_sysprof:--disable-sysprof-plugin} \
- --docdir=%{_docdir}/%{name}-%{version}
-%{__make}
+%meson build \
+ -Dwith_sysprof=%{__true_false sysprof} \
+ -Dwith_vala_pack=%{__true_false vala}
+
+%meson_build -C build
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
-
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-builder/*.la \
- $RPM_BUILD_ROOT%{_libdir}/gnome-builder/plugins/*.la
-
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+%meson_install -C build
%find_lang %{name} --with-gnome
@@ -173,38 +164,38 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS NEWS README doc/html
+%doc AUTHORS NEWS README build/doc/en
%attr(755,root,root) %{_bindir}/gnome-builder
%attr(755,root,root) %{_bindir}/gnome-builder-cli
-%attr(755,root,root) %{_libdir}/gnome-builder-worker
+#%attr(755,root,root) %{_libdir}/gnome-builder-worker
%dir %{_libdir}/gnome-builder
-%attr(755,root,root) %{_libdir}/gnome-builder/libegg-private.so.*.*.*
-%attr(755,root,root) %{_libdir}/gnome-builder/libegg-private.so.0
-%attr(755,root,root) %{_libdir}/gnome-builder/libgd-private.so.*.*.*
-%attr(755,root,root) %{_libdir}/gnome-builder/libgd-private.so.0
+#%attr(755,root,root) %{_libdir}/gnome-builder/libegg-private.so.*.*.*
+#%attr(755,root,root) %{_libdir}/gnome-builder/libegg-private.so.0
+#%attr(755,root,root) %{_libdir}/gnome-builder/libgd-private.so.*.*.*
+#%attr(755,root,root) %{_libdir}/gnome-builder/libgd-private.so.0
%attr(755,root,root) %{_libdir}/gnome-builder/libgstyle-private.so.*.*.*
%attr(755,root,root) %{_libdir}/gnome-builder/libgstyle-private.so.0
%attr(755,root,root) %{_libdir}/gnome-builder/libide-1.0.so
-%attr(755,root,root) %{_libdir}/gnome-builder/libjsonrpc-glib.so.*.*.*
-%attr(755,root,root) %{_libdir}/gnome-builder/libjsonrpc-glib.so.0
-%attr(755,root,root) %{_libdir}/gnome-builder/libpanel-gtk.so.*.*.*
-%attr(755,root,root) %{_libdir}/gnome-builder/libpanel-gtk.so.0
-%attr(755,root,root) %{_libdir}/gnome-builder/librg.so.*.*.*
-%attr(755,root,root) %{_libdir}/gnome-builder/librg.so.0
-%attr(755,root,root) %{_libdir}/gnome-builder/libsearch.so.*.*.*
-%attr(755,root,root) %{_libdir}/gnome-builder/libsearch.so.0
-%attr(755,root,root) %{_libdir}/gnome-builder/libtemplate-glib-1.0.so.*.*.*
-%attr(755,root,root) %{_libdir}/gnome-builder/libtemplate-glib-1.0.so.0
-%attr(755,root,root) %{_libdir}/gnome-builder/libxml-private.so.*.*.*
-%attr(755,root,root) %{_libdir}/gnome-builder/libxml-private.so.0
+#%attr(755,root,root) %{_libdir}/gnome-builder/libjsonrpc-glib.so.*.*.*
+#%attr(755,root,root) %{_libdir}/gnome-builder/libjsonrpc-glib.so.0
+#%attr(755,root,root) %{_libdir}/gnome-builder/libpanel-gtk.so.*.*.*
+#%attr(755,root,root) %{_libdir}/gnome-builder/libpanel-gtk.so.0
+#%attr(755,root,root) %{_libdir}/gnome-builder/librg.so.*.*.*
+#%attr(755,root,root) %{_libdir}/gnome-builder/librg.so.0
+#%attr(755,root,root) %{_libdir}/gnome-builder/libsearch.so.*.*.*
+#%attr(755,root,root) %{_libdir}/gnome-builder/libsearch.so.0
+#%attr(755,root,root) %{_libdir}/gnome-builder/libtemplate-glib-1.0.so.*.*.*
+#%attr(755,root,root) %{_libdir}/gnome-builder/libtemplate-glib-1.0.so.0
+#%attr(755,root,root) %{_libdir}/gnome-builder/libxml-private.so.*.*.*
+#%attr(755,root,root) %{_libdir}/gnome-builder/libxml-private.so.0
%dir %{_libdir}/gnome-builder/girepository-1.0
-%{_libdir}/gnome-builder/girepository-1.0/Egg-1.0.typelib
+#%{_libdir}/gnome-builder/girepository-1.0/Egg-1.0.typelib
%{_libdir}/gnome-builder/girepository-1.0/Gstyle-1.0.typelib
%{_libdir}/gnome-builder/girepository-1.0/Ide-1.0.typelib
-%{_libdir}/gnome-builder/girepository-1.0/Jsonrpc-1.0.typelib
-%{_libdir}/gnome-builder/girepository-1.0/Pnl-1.0.typelib
+#%{_libdir}/gnome-builder/girepository-1.0/Jsonrpc-1.0.typelib
+#%{_libdir}/gnome-builder/girepository-1.0/Pnl-1.0.typelib
%{_libdir}/gnome-builder/girepository-1.0/Template-1.0.typelib
-%attr(755,root,root) %{_libdir}/gnome-builder/ide-list-*
+#%attr(755,root,root) %{_libdir}/gnome-builder/ide-list-*
%dir %{_libdir}/gnome-builder/plugins
%dir %{_datadir}/gnome-builder
%{_datadir}/gnome-builder/fonts
@@ -213,9 +204,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/gnome-builder/plugins/autotools.plugin
%attr(755,root,root) %{_libdir}/gnome-builder/plugins/libautotools-plugin.so
-%{_libdir}/gnome-builder/plugins/autotools-templates.plugin
-%{_libdir}/gnome-builder/plugins/autotools_templates
-%{_datadir}/gnome-builder/plugins/autotools_templates
+#%{_libdir}/gnome-builder/plugins/autotools-templates.plugin
+#%{_libdir}/gnome-builder/plugins/autotools_templates
+#%{_datadir}/gnome-builder/plugins/autotools_templates
%{_libdir}/gnome-builder/plugins/beautifier.plugin
%attr(755,root,root) %{_libdir}/gnome-builder/plugins/libbeautifier_plugin.so
@@ -252,9 +243,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/gnome-builder/plugins/file-search.plugin
%attr(755,root,root) %{_libdir}/gnome-builder/plugins/libfile-search.so
-%{_libdir}/gnome-builder/plugins/fpaste.plugin
-%{_libdir}/gnome-builder/plugins/fpaste_plugin
-%{_datadir}/gnome-builder/plugins/fpaste_plugin
+#%{_libdir}/gnome-builder/plugins/fpaste.plugin
+#%{_libdir}/gnome-builder/plugins/fpaste_plugin
+#%{_datadir}/gnome-builder/plugins/fpaste_plugin
%{_libdir}/gnome-builder/plugins/gcc.plugin
%attr(755,root,root) %{_libdir}/gnome-builder/plugins/libgcc-plugin.so
@@ -303,7 +294,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/gnome-builder/plugins/libsupport-plugin.so
%{_libdir}/gnome-builder/plugins/symbol-tree.plugin
-%attr(755,root,root) %{_libdir}/gnome-builder/plugins/libsymbol-tree.so
+#%attr(755,root,root) %{_libdir}/gnome-builder/plugins/libsymbol-tree.so
%{_libdir}/gnome-builder/plugins/sysmon.plugin
%attr(755,root,root) %{_libdir}/gnome-builder/plugins/libsysmon.so
@@ -317,10 +308,12 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/gnome-builder/plugins/libterminal.so
%{_libdir}/gnome-builder/plugins/todo.plugin
-%{_libdir}/gnome-builder/plugins/todo_plugin
+#%{_libdir}/gnome-builder/plugins/todo_plugin
+%if %{with vala}
%{_libdir}/gnome-builder/plugins/vala-pack.plugin
%attr(755,root,root) %{_libdir}/gnome-builder/plugins/libvala-pack-plugin.so
+%endif
%{_libdir}/gnome-builder/plugins/xml-pack.plugin
%attr(755,root,root) %{_libdir}/gnome-builder/plugins/libxml-pack-plugin.so
@@ -348,10 +341,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/gnome-builder/plugins/rustup.plugin
%{_libdir}/gnome-builder/plugins/rustup_plugin
-%{_datadir}/gnome-builder/plugins/rustup_plugin
+#%{_datadir}/gnome-builder/plugins/rustup_plugin
%{_libdir}/gnome-builder/plugins/valgrind.plugin
-%{_libdir}/gnome-builder/plugins/valgrind_plugin
+#%{_libdir}/gnome-builder/plugins/valgrind_plugin
%{_datadir}/appdata/org.gnome.Builder.appdata.xml
%{_datadir}/dbus-1/services/org.gnome.Builder.service
@@ -372,31 +365,32 @@ rm -rf $RPM_BUILD_ROOT
%{_iconsdir}/hicolor/*x*/apps/org.gnome.Builder.png
%{_iconsdir}/hicolor/symbolic/apps/org.gnome.Builder-symbolic.svg
%{py3_sitedir}/gi/overrides/Ide.py
-%{py3_sitedir}/gi/overrides/__pycache__/Ide.*
+#%{py3_sitedir}/gi/overrides/__pycache__/Ide.*
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/gnome-builder/libegg-private.so
-%attr(755,root,root) %{_libdir}/gnome-builder/libgd-private.so
+#%attr(755,root,root) %{_libdir}/gnome-builder/libegg-private.so
+#%attr(755,root,root) %{_libdir}/gnome-builder/libgd-private.so
%attr(755,root,root) %{_libdir}/gnome-builder/libgstyle-private.so
-%attr(755,root,root) %{_libdir}/gnome-builder/libjsonrpc-glib.so
-%attr(755,root,root) %{_libdir}/gnome-builder/libpanel-gtk.so
-%attr(755,root,root) %{_libdir}/gnome-builder/librg.so
-%attr(755,root,root) %{_libdir}/gnome-builder/libsearch.so
-%attr(755,root,root) %{_libdir}/gnome-builder/libtemplate-glib-1.0.so
-%attr(755,root,root) %{_libdir}/gnome-builder/libxml-private.so
-%{_includedir}/gnome-builder-*
+#%attr(755,root,root) %{_libdir}/gnome-builder/libjsonrpc-glib.so
+#%attr(755,root,root) %{_libdir}/gnome-builder/libpanel-gtk.so
+#%attr(755,root,root) %{_libdir}/gnome-builder/librg.so
+#%attr(755,root,root) %{_libdir}/gnome-builder/libsearch.so
+#%attr(755,root,root) %{_libdir}/gnome-builder/libtemplate-glib-1.0.so
+#%attr(755,root,root) %{_libdir}/gnome-builder/libxml-private.so
+%{_includedir}/gnome-builder
%dir %{_datadir}/gnome-builder/gir-1.0
-%{_datadir}/gnome-builder/gir-1.0/Egg-1.0.gir
+#%{_datadir}/gnome-builder/gir-1.0/Egg-1.0.gir
%{_datadir}/gnome-builder/gir-1.0/Gstyle-1.0.gir
%{_datadir}/gnome-builder/gir-1.0/Ide-1.0.gir
-%{_datadir}/gnome-builder/gir-1.0/Jsonrpc-1.0.gir
-%{_datadir}/gnome-builder/gir-1.0/Pnl-1.0.gir
+#%{_datadir}/gnome-builder/gir-1.0/Jsonrpc-1.0.gir
+#%{_datadir}/gnome-builder/gir-1.0/Pnl-1.0.gir
%{_datadir}/gnome-builder/gir-1.0/Template-1.0.gir
%dir %{_libdir}/gnome-builder/pkgconfig
%{_libdir}/gnome-builder/pkgconfig/libide-1.0.pc
%{_libdir}/gnome-builder/pkgconfig/template-glib-1.0.pc
+%if %{with vala}
%files -n vala-gnome-builder
%defattr(644,root,root,755)
%dir %{_datadir}/gnome-builder/vapi
@@ -412,3 +406,4 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gnome-builder/vapi/panel-gtk.vapi
%{_datadir}/gnome-builder/vapi/template-glib-1.0.deps
%{_datadir}/gnome-builder/vapi/template-glib-1.0.vapi
+%endif
diff --git a/gnome-builder-link.patch b/gnome-builder-link.patch
deleted file mode 100644
index 70ec841..0000000
--- a/gnome-builder-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-builder-3.18.1/contrib/search/Makefile.am.orig 2015-10-18 20:13:57.511908788 +0200
-+++ gnome-builder-3.18.1/contrib/search/Makefile.am 2015-10-18 20:14:04.661908640 +0200
-@@ -15,7 +15,7 @@
- $(NULL)
-
- libsearch_la_LIBADD = \
-- $(SEARCH_LIBADD) \
-+ $(SEARCH_LIBS) \
- $(NULL)
-
- libsearch_la_LDFLAGS = \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnome-builder.git/commitdiff/5512e48b6e2b9f713aacfb330d79e7fd48c3acc7
More information about the pld-cvs-commit
mailing list