The package rpms/ethos.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/ethos.git/commit/?id=ee8414c837c02e4....
Change: +ExcludeArch: %{ix86}
Thanks.
Full change: ============
commit ee8414c837c02e415106831eab6ef1ae798d1ce0 Author: Jerry James loganjerry@gmail.com Date: Thu Jan 30 12:04:10 2025 -0700
Initial RPM
diff --git a/.gitignore b/.gitignore index 39d23c0..81457bb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -ethos-0.2.2.tar.gz +/ethos-*.tar.gz diff --git a/111.patch b/111.patch new file mode 100644 index 0000000..f1815db --- /dev/null +++ b/111.patch @@ -0,0 +1,34 @@ +From 9afcbca2ed58606fa8e4dfb3a0052650d9eed954 Mon Sep 17 00:00:00 2001 +From: Jerry James loganjerry@gmail.com +Date: Thu, 30 Jan 2025 11:57:14 -0700 +Subject: [PATCH] Explicitly #include cstdint.h for GCC 15 + +--- + src/expr.h | 1 + + src/lexer.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/expr.h b/src/expr.h +index abaf086a..3fabf29b 100644 +--- a/src/expr.h ++++ b/src/expr.h +@@ -9,6 +9,7 @@ + #ifndef EXPR_H + #define EXPR_H + ++#include <cstdint> + #include <map> + #include <unordered_set> + #include <vector> +diff --git a/src/lexer.h b/src/lexer.h +index 94ad5866..c6ca17e2 100644 +--- a/src/lexer.h ++++ b/src/lexer.h +@@ -10,6 +10,7 @@ + #define LEXER_H + + #include <array> ++#include <cstdint> + #include <fstream> + #include <iosfwd> + #include <string> diff --git a/README.md b/README.md new file mode 100644 index 0000000..5963e6e --- /dev/null +++ b/README.md @@ -0,0 +1,6 @@ +# ethos + +The [Ethos checker](https://github.com/cvc5/ethos) is an efficient and +extensible tool for checking proofs of +[Satisfiability Modulo Theories (SMT)](https://en.wikipedia.org/wiki/Satisfiability_modulo_theories) +solvers. diff --git a/changelog b/changelog new file mode 100644 index 0000000..ceede29 --- /dev/null +++ b/changelog @@ -0,0 +1,2 @@ +* Thu Jan 30 2025 Jerry James loganjerry@gmail.com - 0.1.1-1 +- Initial RPM diff --git a/ethos-0.2.2-fix-plugin-loader-dir.patch b/ethos-0.2.2-fix-plugin-loader-dir.patch deleted file mode 100644 index 74eaf65..0000000 --- a/ethos-0.2.2-fix-plugin-loader-dir.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up ethos-0.2.2/ethos/Makefile.am.plugin-loader-dir ethos-0.2.2/ethos/Makefile.am ---- ethos-0.2.2/ethos/Makefile.am.plugin-loader-dir 2011-05-03 15:33:21.778747881 -0400 -+++ ethos-0.2.2/ethos/Makefile.am 2011-05-03 15:33:47.025371361 -0400 -@@ -44,7 +44,7 @@ libethos_@ETHOS_API_VERSION@_la_CFLAGS = - -DLIBDIR=""$(libdir)"" \ - -DG_LOG_DOMAIN="Ethos" \ - -DG_DISABLE_DEPRECATED \ -- -DETHOS_PLUGIN_LOADERS_DIR=""$(prefix)/lib/ethos/plugin-loaders"" \ -+ -DETHOS_PLUGIN_LOADERS_DIR=""$(libdir)/ethos/plugin-loaders"" \ - $(ETHOS_MAINTAINER_CFLAGS) \ - $(ETHOS_DEBUG_CFLAGS) \ - $(ETHOS_CFLAGS) \ -diff -up ethos-0.2.2/ethos/Makefile.in.plugin-loader-dir ethos-0.2.2/ethos/Makefile.in ---- ethos-0.2.2/ethos/Makefile.in.plugin-loader-dir 2011-05-03 15:34:07.400067874 -0400 -+++ ethos-0.2.2/ethos/Makefile.in 2011-05-03 15:34:30.450724934 -0400 -@@ -372,7 +372,7 @@ libethos_@ETHOS_API_VERSION@_la_CFLAGS = - -DLIBDIR=""$(libdir)"" \ - -DG_LOG_DOMAIN="Ethos" \ - -DG_DISABLE_DEPRECATED \ -- -DETHOS_PLUGIN_LOADERS_DIR=""$(prefix)/lib/ethos/plugin-loaders"" \ -+ -DETHOS_PLUGIN_LOADERS_DIR=""$(libdir)/ethos/plugin-loaders"" \ - $(ETHOS_MAINTAINER_CFLAGS) \ - $(ETHOS_DEBUG_CFLAGS) \ - $(ETHOS_CFLAGS) \ diff --git a/ethos-0.2.2-gtk3.patch b/ethos-0.2.2-gtk3.patch deleted file mode 100644 index 378c904..0000000 --- a/ethos-0.2.2-gtk3.patch +++ /dev/null @@ -1,109 +0,0 @@ -diff -up ethos-0.2.2/configure.ac.gtk3 ethos-0.2.2/configure.ac ---- ethos-0.2.2/configure.ac.gtk3 2011-05-03 15:27:10.225456980 -0400 -+++ ethos-0.2.2/configure.ac 2011-05-03 15:27:10.231456906 -0400 -@@ -73,7 +73,7 @@ PKG_CHECK_MODULES(ETHOS, gobject-2.0 >= - AC_SUBST(ETHOS_CFLAGS) - AC_SUBST(ETHOS_LIBS) - --PKG_CHECK_MODULES(ETHOS_UI, gtk+-2.0 >= gtk_req_version) -+PKG_CHECK_MODULES(ETHOS_UI, gtk+-3.0 >= gtk_req_version) - AC_SUBST(ETHOS_UI_CFLAGS) - AC_SUBST(ETHOS_UI_LIBS) - -diff -up ethos-0.2.2/configure.gtk3 ethos-0.2.2/configure ---- ethos-0.2.2/configure.gtk3 2011-05-03 15:27:10.228456944 -0400 -+++ ethos-0.2.2/configure 2011-05-03 15:27:10.234456868 -0400 -@@ -12942,12 +12942,12 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_ETHOS_UI_CFLAGS="$ETHOS_UI_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.10""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.10") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 2.10""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 2.10") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_ETHOS_UI_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.10" 2>/dev/null` -+ pkg_cv_ETHOS_UI_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 2.10" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -12960,12 +12960,12 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_ETHOS_UI_LIBS="$ETHOS_UI_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.10""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.10") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 2.10""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 2.10") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_ETHOS_UI_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.10" 2>/dev/null` -+ pkg_cv_ETHOS_UI_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 2.10" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -12984,14 +12984,14 @@ else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- ETHOS_UI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= 2.10"` -+ ETHOS_UI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-3.0 >= 2.10"` - else -- ETHOS_UI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.10"` -+ ETHOS_UI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-3.0 >= 2.10"` - fi - # Put the nasty error message in config.log where it belongs - echo "$ETHOS_UI_PKG_ERRORS" >&5 - -- as_fn_error "Package requirements (gtk+-2.0 >= 2.10) were not met: -+ as_fn_error "Package requirements (gtk+-3.0 >= 2.10) were not met: - - $ETHOS_UI_PKG_ERRORS - -diff -up ethos-0.2.2/ethos/ethos-ui-manager-widget.c.gtk3 ethos-0.2.2/ethos/ethos-ui-manager-widget.c ---- ethos-0.2.2/ethos/ethos-ui-manager-widget.c.gtk3 2011-05-03 15:27:43.003054095 -0400 -+++ ethos-0.2.2/ethos/ethos-ui-manager-widget.c 2011-05-03 15:28:42.653322574 -0400 -@@ -320,7 +320,7 @@ show_error_dialog: - gtk_window_set_title (GTK_WINDOW (dialog), ""); - gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); - gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); -- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); -+ /* gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); */ - content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); - gtk_container_set_border_width (GTK_CONTAINER (content_area), 12); - -@@ -561,10 +561,6 @@ ethos_ui_manager_widget_init (EthosUIMan - manager_widget->priv->about = about; - manager_widget->priv->list_store = list_store; - -- if (gtk_about_dialog_set_url_hook (url_hook_cb, NULL, NULL) != NULL) { -- g_warning ("Ethos overwrote a previous GtkAboutDialog url hook" -- ". This may cause a bug in your application."); -- } - } - - /** -diff -up ethos-0.2.2/ethos-ui.pc.in.gtk3 ethos-0.2.2/ethos-ui.pc.in ---- ethos-0.2.2/ethos-ui.pc.in.gtk3 2009-11-07 22:39:13.000000000 -0500 -+++ ethos-0.2.2/ethos-ui.pc.in 2011-05-03 15:27:10.234456868 -0400 -@@ -8,4 +8,4 @@ Description: User interface widgets for - Version: @VERSION@ - Libs: -L${libdir} -lethos-ui-1.0 - Cflags: -I${includedir}/ethos-1.0 --Requires: ethos-1.0 gtk+-2.0 -+Requires: ethos-1.0 gtk+-3.0 -diff -up ethos-0.2.2/examples/vala/Makefile.am.gtk3 ethos-0.2.2/examples/vala/Makefile.am ---- ethos-0.2.2/examples/vala/Makefile.am.gtk3 2009-11-07 22:39:13.000000000 -0500 -+++ ethos-0.2.2/examples/vala/Makefile.am 2011-05-03 15:27:10.234456868 -0400 -@@ -13,7 +13,7 @@ basic_LDADD = \ - basic_sources = basic.c - basic_headers = basic.h - basic.c basic.h: $(srcdir)/basic.vala -- valac -C $(srcdir)/basic.vala --vapidir $(top_srcdir)/bindings/vala --pkg ethos-1.0 --pkg gtk+-2.0 -+ valac -C $(srcdir)/basic.vala --vapidir $(top_srcdir)/bindings/vala --pkg ethos-1.0 --pkg gtk+-3.0 - endif - - EXTRA_DIST = basic.vala diff --git a/ethos-0.2.2-vala.patch b/ethos-0.2.2-vala.patch deleted file mode 100644 index a0a3806..0000000 --- a/ethos-0.2.2-vala.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -up ethos-0.2.2/configure.ac.vala ethos-0.2.2/configure.ac ---- ethos-0.2.2/configure.ac.vala 2011-02-07 10:43:19.000000000 +0100 -+++ ethos-0.2.2/configure.ac 2011-02-07 10:43:50.000000000 +0100 -@@ -81,7 +81,7 @@ AM_CONDITIONAL(ENABLE_GLIB_TEST, test "x - - dnl = Enable Vala ========================================================== - enable_vala=no --PKG_CHECK_MODULES(VALA, vala-1.0, enable_vala=yes, enable_vala=no) -+PKG_CHECK_MODULES(VALA, libvala-0.12, enable_vala=yes, enable_vala=no) - if test "x$enable_vala" = "xyes"; then - VAPI_DIR=`pkg-config --variable=vapidir vala-1.0` - else -diff -up ethos-0.2.2/configure.vala ethos-0.2.2/configure ---- ethos-0.2.2/configure.vala 2011-02-07 10:43:15.000000000 +0100 -+++ ethos-0.2.2/configure 2011-02-07 10:43:37.000000000 +0100 -@@ -13045,12 +13045,12 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_VALA_CFLAGS="$VALA_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "vala-1.0""; } >&5 -- ($PKG_CONFIG --exists --print-errors "vala-1.0") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "libvala-0.12""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libvala-0.12") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_VALA_CFLAGS=`$PKG_CONFIG --cflags "vala-1.0" 2>/dev/null` -+ pkg_cv_VALA_CFLAGS=`$PKG_CONFIG --cflags "libvala-0.12" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -13063,12 +13063,12 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_VALA_LIBS="$VALA_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "vala-1.0""; } >&5 -- ($PKG_CONFIG --exists --print-errors "vala-1.0") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "libvala-0.12""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libvala-0.12") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_VALA_LIBS=`$PKG_CONFIG --libs "vala-1.0" 2>/dev/null` -+ pkg_cv_VALA_LIBS=`$PKG_CONFIG --libs "libvala-0.12" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -13087,9 +13087,9 @@ else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- VALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "vala-1.0"` -+ VALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libvala-0.12"` - else -- VALA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "vala-1.0"` -+ VALA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libvala-0.12"` - fi - # Put the nasty error message in config.log where it belongs - echo "$VALA_PKG_ERRORS" >&5 -@@ -13107,7 +13107,7 @@ $as_echo "yes" >&6; } - enable_vala=yes - fi - if test "x$enable_vala" = "xyes"; then -- VAPI_DIR=`pkg-config --variable=vapidir vala-1.0` -+ VAPI_DIR=`pkg-config --variable=vapidir libvala-0.12` - else - VAPI_DIR= - fi -diff -up ethos-0.2.2/examples/vala/basic.vala ethos-0.2.2/examples/vala/basic diff --git a/ethos.spec b/ethos.spec index ef0255e..f8e109c 100644 --- a/ethos.spec +++ b/ethos.spec @@ -1,173 +1,50 @@ -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +Name: ethos +Version: 0.1.1 +Release: %autorelease +Summary: Flexible and efficient proof checker for SMT solvers
-Name: ethos -Version: 0.2.2 -Release: 11%{?dist} -Summary: Plugin framework for GLib +License: BSD-3-Clause +URL: https://github.com/cvc5/ethos +VCS: git:%{url}.git +Source: %{url}/archive/%{name}-%{version}.tar.gz +# Explicitly include cstdint.h; fixes FTBFS with GCC 15 +Patch: %{url}/pull/111.patch
-Group: System Environment/Libraries -License: LGPLv2+ -URL: http://git.dronelabs.com/ethos/about/ -Source0: http://ftp.dronelabs.com/sources/ethos/0.2/%%7Bname%7D-%%7Bversion%7D.tar.gz -Patch0: %{name}-0.2.2-vala.patch -Patch1: ethos-0.2.2-gtk3.patch -Patch2: ethos-0.2.2-fix-plugin-loader-dir.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86}
-BuildRequires: gtk3-devel -BuildRequires: gjs-devel -BuildRequires: python-devel -BuildRequires: pygtk2-devel -BuildRequires: vala-devel -BuildRequires: vala-tools +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: gmp-devel
%description -Ethos is a plugin framework that is written in C using the GLib and GObject -libraries. The goal is to have a single framework for applications that lower -the barrier to entry for extensions. To enable as many communities as possible, -various language bindings are provided to allow extensions in the language of -choice. - -Ethos includes a GUI library as well named libethos-ui. This library provides -a gtk+ widget for managing plugins within your application. Typically, you can -simply add this to a "Plugins" tab in your applications preferences dialog. - -%package devel -Summary: Development package for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: pkgconfig -Requires: gobject-introspection-devel - -%description devel -Files for development with %{name}. - -%package docs -Summary: Documentation for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -BuildArch: noarch - -%description docs -Documentation for development with %{name}. - -%package python -Summary: Python bindings for %{name} -Group: Development/Languages -Requires: %{name} = %{version}-%{release} -Requires: gnome-python2 -Requires: pygtk2 - -%description python -Python bindings for development with %{name}. - -%package vala -Summary: Vala bindings for %{name} -Group: Development/Languages -Requires: %{name} = %{version}-%{release} -Requires: vala -BuildArch: noarch - -%description vala -Vala bindings for development with %{name}. +The Ethos checker is an efficient and extensible tool for checking proofs of +Satisfiability Modulo Theories (SMT) solvers.
%prep -%setup -q -%patch0 -p1 -b .vala -%patch1 -p1 -b .gtk3 -%patch2 -p1 -b .plugin-loader-dir +%autosetup -n %{name}-%{name}-%{version} -p1
-%build -%configure --disable-static --enable-introspection --enable-python +# We want to know about use of deprecated interfaces +sed -i '/Wno-deprecated/d' CMakeLists.txt
-# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +# Make sure the bundled copy of drat-trim is not used in the build +rm -fr contrib/drat_trim
-make %{?_smp_mflags} V=1 +%build +%cmake +%cmake_build
%install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} INSTALL='install -p' - -#Remove libtool archives. -find %{buildroot} -name '*.la' -exec rm -f {} ';' - -%find_lang %{name} - -%clean -rm -rf %{buildroot} - -%post -p /sbin/ldconfig +mkdir -p %{buildroot}%{_bindir} +cp -p %{_vpath_builddir}/src/ethos %{buildroot}%{_bindir}
-%postun -p /sbin/ldconfig +%check +%ctest
-%files -f %{name}.lang -%defattr(-,root,root,-) -%doc COPYING AUTHORS README NEWS -%{_libdir}/libethos*.so.* -%dir %{_libdir}/ethos -%dir %{_libdir}/ethos/plugin-loaders -%{_libdir}/ethos/plugin-loaders/libcloader.so.* -%{_libdir}/ethos/plugin-loaders/libjsloader.so.* -%{_libdir}/girepository-1.0/Ethos-1.0.typelib -%{_datadir}/ethos - -%files devel -%defattr(-,root,root,-) -%{_includedir}/ethos-1.0 -%{_libdir}/ethos/plugin-loaders/lib*.so -%{_libdir}/pkgconfig/ethos*1.0.pc -%{_libdir}/*.so -%{_datadir}/gir-1.0/Ethos-1.0.gir - -%files docs -%defattr(-,root,root,-) -%doc %{_datadir}/gtk-doc/html/ethos - -%files python -%defattr(-,root,root,-) -%{_libdir}/ethos/plugin-loaders/libpythonloader.so.* -%{_datadir}/pygtk/2.0/defs/ethos* -%{python_sitearch}/gtk-2.0/ethos -%{python_sitearch}/gtk-2.0/_ethos* - -%files vala -%defattr(-,root,root,-) -%{_datadir}/vala/vapi/ethos-1.0.vapi -%{_datadir}/vala/vapi/ethos-ui-1.0.vapi +%files +%doc NEWS.md README.md user_manual.md +%license COPYING +%{_bindir}/ethos
%changelog -* Tue May 03 2011 Tom Callaway spot@fedoraproject.org - 0.2.2-11 -- move to gtk3 -- fix plugin-loader-dir - -* Tue Feb 08 2011 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 0.2.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Feb 7 2011 Dan Horák <dan[at]danny.cz> 0.2.2-9 -- detect recent vala - -* Wed Sep 22 2010 Peter Robinson pbrobinson@gmail.com 0.2.2-8 -- Bump build - -* Wed Jul 21 2010 David Malcolm dmalcolm@redhat.com - 0.2.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Mon Jul 12 2010 Colin Walters walters@verbum.org - 0.2.2-6 -- Rebuild against new gobject-introspection - -* Sat Jan 9 2010 Peter Robinson pbrobinson@gmail.com 0.2.2-4 -- Review updates - -* Mon Dec 28 2009 Peter Robinson pbrobinson@gmail.com 0.2.2-3 -- Update bindings group - -* Thu Dec 17 2009 Peter Robinson pbrobinson@gmail.com 0.2.2-2 -- Fix license - -* Thu Nov 26 2009 Peter Robinson pbrobinson@gmail.com 0.2.2-1 -- Update to 0.2.2 final release - -* Fri Oct 16 2009 Peter Robinson pbrobinson@gmail.com 0.2.2-0.1 -- Initial packaging of 0.2.2 snapshot +%autochangelog diff --git a/sources b/sources index 23b65f5..bd7ce60 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -36cf1ef444a224556bba4d441c400300 ethos-0.2.2.tar.gz +SHA512 (ethos-0.1.1.tar.gz) = 423e724db991552eeef82faf4df28c20eece6d74f012bf329420b0b36e9c7d7cd20276234f9e6b693902dc583fbbb136400ad7fa0fd914a371beb34cd897ff93
commit 0b4d05988657fd13ab63a0563ea92dfd6127a229 Author: Fedora Release Engineering releng@fedoraproject.org Date: Thu Jan 23 12:33:06 2025 +0000
Unretirement request: pagure.io/releng/issue/12535 Revert "package is dead"
This reverts commit c58f463525777a27738978219bf2cfcc57ff13e8.
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
diff --git a/dead.package b/dead.package deleted file mode 100644 index bc1eaaa..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -This package it dead. diff --git a/ethos-0.2.2-fix-plugin-loader-dir.patch b/ethos-0.2.2-fix-plugin-loader-dir.patch new file mode 100644 index 0000000..74eaf65 --- /dev/null +++ b/ethos-0.2.2-fix-plugin-loader-dir.patch @@ -0,0 +1,24 @@ +diff -up ethos-0.2.2/ethos/Makefile.am.plugin-loader-dir ethos-0.2.2/ethos/Makefile.am +--- ethos-0.2.2/ethos/Makefile.am.plugin-loader-dir 2011-05-03 15:33:21.778747881 -0400 ++++ ethos-0.2.2/ethos/Makefile.am 2011-05-03 15:33:47.025371361 -0400 +@@ -44,7 +44,7 @@ libethos_@ETHOS_API_VERSION@_la_CFLAGS = + -DLIBDIR=""$(libdir)"" \ + -DG_LOG_DOMAIN="Ethos" \ + -DG_DISABLE_DEPRECATED \ +- -DETHOS_PLUGIN_LOADERS_DIR=""$(prefix)/lib/ethos/plugin-loaders"" \ ++ -DETHOS_PLUGIN_LOADERS_DIR=""$(libdir)/ethos/plugin-loaders"" \ + $(ETHOS_MAINTAINER_CFLAGS) \ + $(ETHOS_DEBUG_CFLAGS) \ + $(ETHOS_CFLAGS) \ +diff -up ethos-0.2.2/ethos/Makefile.in.plugin-loader-dir ethos-0.2.2/ethos/Makefile.in +--- ethos-0.2.2/ethos/Makefile.in.plugin-loader-dir 2011-05-03 15:34:07.400067874 -0400 ++++ ethos-0.2.2/ethos/Makefile.in 2011-05-03 15:34:30.450724934 -0400 +@@ -372,7 +372,7 @@ libethos_@ETHOS_API_VERSION@_la_CFLAGS = + -DLIBDIR=""$(libdir)"" \ + -DG_LOG_DOMAIN="Ethos" \ + -DG_DISABLE_DEPRECATED \ +- -DETHOS_PLUGIN_LOADERS_DIR=""$(prefix)/lib/ethos/plugin-loaders"" \ ++ -DETHOS_PLUGIN_LOADERS_DIR=""$(libdir)/ethos/plugin-loaders"" \ + $(ETHOS_MAINTAINER_CFLAGS) \ + $(ETHOS_DEBUG_CFLAGS) \ + $(ETHOS_CFLAGS) \ diff --git a/ethos-0.2.2-gtk3.patch b/ethos-0.2.2-gtk3.patch new file mode 100644 index 0000000..378c904 --- /dev/null +++ b/ethos-0.2.2-gtk3.patch @@ -0,0 +1,109 @@ +diff -up ethos-0.2.2/configure.ac.gtk3 ethos-0.2.2/configure.ac +--- ethos-0.2.2/configure.ac.gtk3 2011-05-03 15:27:10.225456980 -0400 ++++ ethos-0.2.2/configure.ac 2011-05-03 15:27:10.231456906 -0400 +@@ -73,7 +73,7 @@ PKG_CHECK_MODULES(ETHOS, gobject-2.0 >= + AC_SUBST(ETHOS_CFLAGS) + AC_SUBST(ETHOS_LIBS) + +-PKG_CHECK_MODULES(ETHOS_UI, gtk+-2.0 >= gtk_req_version) ++PKG_CHECK_MODULES(ETHOS_UI, gtk+-3.0 >= gtk_req_version) + AC_SUBST(ETHOS_UI_CFLAGS) + AC_SUBST(ETHOS_UI_LIBS) + +diff -up ethos-0.2.2/configure.gtk3 ethos-0.2.2/configure +--- ethos-0.2.2/configure.gtk3 2011-05-03 15:27:10.228456944 -0400 ++++ ethos-0.2.2/configure 2011-05-03 15:27:10.234456868 -0400 +@@ -12942,12 +12942,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_ETHOS_UI_CFLAGS="$ETHOS_UI_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.10""; } >&5 +- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.10") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 2.10""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 2.10") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_ETHOS_UI_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.10" 2>/dev/null` ++ pkg_cv_ETHOS_UI_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 2.10" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -12960,12 +12960,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_ETHOS_UI_LIBS="$ETHOS_UI_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.10""; } >&5 +- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.10") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 2.10""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 2.10") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_ETHOS_UI_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.10" 2>/dev/null` ++ pkg_cv_ETHOS_UI_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 2.10" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -12984,14 +12984,14 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- ETHOS_UI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= 2.10"` ++ ETHOS_UI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-3.0 >= 2.10"` + else +- ETHOS_UI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.10"` ++ ETHOS_UI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-3.0 >= 2.10"` + fi + # Put the nasty error message in config.log where it belongs + echo "$ETHOS_UI_PKG_ERRORS" >&5 + +- as_fn_error "Package requirements (gtk+-2.0 >= 2.10) were not met: ++ as_fn_error "Package requirements (gtk+-3.0 >= 2.10) were not met: + + $ETHOS_UI_PKG_ERRORS + +diff -up ethos-0.2.2/ethos/ethos-ui-manager-widget.c.gtk3 ethos-0.2.2/ethos/ethos-ui-manager-widget.c +--- ethos-0.2.2/ethos/ethos-ui-manager-widget.c.gtk3 2011-05-03 15:27:43.003054095 -0400 ++++ ethos-0.2.2/ethos/ethos-ui-manager-widget.c 2011-05-03 15:28:42.653322574 -0400 +@@ -320,7 +320,7 @@ show_error_dialog: + gtk_window_set_title (GTK_WINDOW (dialog), ""); + gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); + gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); +- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); ++ /* gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); */ + content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); + gtk_container_set_border_width (GTK_CONTAINER (content_area), 12); + +@@ -561,10 +561,6 @@ ethos_ui_manager_widget_init (EthosUIMan + manager_widget->priv->about = about; + manager_widget->priv->list_store = list_store; + +- if (gtk_about_dialog_set_url_hook (url_hook_cb, NULL, NULL) != NULL) { +- g_warning ("Ethos overwrote a previous GtkAboutDialog url hook" +- ". This may cause a bug in your application."); +- } + } + + /** +diff -up ethos-0.2.2/ethos-ui.pc.in.gtk3 ethos-0.2.2/ethos-ui.pc.in +--- ethos-0.2.2/ethos-ui.pc.in.gtk3 2009-11-07 22:39:13.000000000 -0500 ++++ ethos-0.2.2/ethos-ui.pc.in 2011-05-03 15:27:10.234456868 -0400 +@@ -8,4 +8,4 @@ Description: User interface widgets for + Version: @VERSION@ + Libs: -L${libdir} -lethos-ui-1.0 + Cflags: -I${includedir}/ethos-1.0 +-Requires: ethos-1.0 gtk+-2.0 ++Requires: ethos-1.0 gtk+-3.0 +diff -up ethos-0.2.2/examples/vala/Makefile.am.gtk3 ethos-0.2.2/examples/vala/Makefile.am +--- ethos-0.2.2/examples/vala/Makefile.am.gtk3 2009-11-07 22:39:13.000000000 -0500 ++++ ethos-0.2.2/examples/vala/Makefile.am 2011-05-03 15:27:10.234456868 -0400 +@@ -13,7 +13,7 @@ basic_LDADD = \ + basic_sources = basic.c + basic_headers = basic.h + basic.c basic.h: $(srcdir)/basic.vala +- valac -C $(srcdir)/basic.vala --vapidir $(top_srcdir)/bindings/vala --pkg ethos-1.0 --pkg gtk+-2.0 ++ valac -C $(srcdir)/basic.vala --vapidir $(top_srcdir)/bindings/vala --pkg ethos-1.0 --pkg gtk+-3.0 + endif + + EXTRA_DIST = basic.vala diff --git a/ethos-0.2.2-vala.patch b/ethos-0.2.2-vala.patch new file mode 100644 index 0000000..a0a3806 --- /dev/null +++ b/ethos-0.2.2-vala.patch @@ -0,0 +1,69 @@ +diff -up ethos-0.2.2/configure.ac.vala ethos-0.2.2/configure.ac +--- ethos-0.2.2/configure.ac.vala 2011-02-07 10:43:19.000000000 +0100 ++++ ethos-0.2.2/configure.ac 2011-02-07 10:43:50.000000000 +0100 +@@ -81,7 +81,7 @@ AM_CONDITIONAL(ENABLE_GLIB_TEST, test "x + + dnl = Enable Vala ========================================================== + enable_vala=no +-PKG_CHECK_MODULES(VALA, vala-1.0, enable_vala=yes, enable_vala=no) ++PKG_CHECK_MODULES(VALA, libvala-0.12, enable_vala=yes, enable_vala=no) + if test "x$enable_vala" = "xyes"; then + VAPI_DIR=`pkg-config --variable=vapidir vala-1.0` + else +diff -up ethos-0.2.2/configure.vala ethos-0.2.2/configure +--- ethos-0.2.2/configure.vala 2011-02-07 10:43:15.000000000 +0100 ++++ ethos-0.2.2/configure 2011-02-07 10:43:37.000000000 +0100 +@@ -13045,12 +13045,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_VALA_CFLAGS="$VALA_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "vala-1.0""; } >&5 +- ($PKG_CONFIG --exists --print-errors "vala-1.0") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "libvala-0.12""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libvala-0.12") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_VALA_CFLAGS=`$PKG_CONFIG --cflags "vala-1.0" 2>/dev/null` ++ pkg_cv_VALA_CFLAGS=`$PKG_CONFIG --cflags "libvala-0.12" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -13063,12 +13063,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_VALA_LIBS="$VALA_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "vala-1.0""; } >&5 +- ($PKG_CONFIG --exists --print-errors "vala-1.0") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "libvala-0.12""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libvala-0.12") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_VALA_LIBS=`$PKG_CONFIG --libs "vala-1.0" 2>/dev/null` ++ pkg_cv_VALA_LIBS=`$PKG_CONFIG --libs "libvala-0.12" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -13087,9 +13087,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- VALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "vala-1.0"` ++ VALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libvala-0.12"` + else +- VALA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "vala-1.0"` ++ VALA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libvala-0.12"` + fi + # Put the nasty error message in config.log where it belongs + echo "$VALA_PKG_ERRORS" >&5 +@@ -13107,7 +13107,7 @@ $as_echo "yes" >&6; } + enable_vala=yes + fi + if test "x$enable_vala" = "xyes"; then +- VAPI_DIR=`pkg-config --variable=vapidir vala-1.0` ++ VAPI_DIR=`pkg-config --variable=vapidir libvala-0.12` + else + VAPI_DIR= + fi +diff -up ethos-0.2.2/examples/vala/basic.vala ethos-0.2.2/examples/vala/basic diff --git a/ethos.spec b/ethos.spec new file mode 100644 index 0000000..ef0255e --- /dev/null +++ b/ethos.spec @@ -0,0 +1,173 @@ +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} + +Name: ethos +Version: 0.2.2 +Release: 11%{?dist} +Summary: Plugin framework for GLib + +Group: System Environment/Libraries +License: LGPLv2+ +URL: http://git.dronelabs.com/ethos/about/ +Source0: http://ftp.dronelabs.com/sources/ethos/0.2/%%7Bname%7D-%%7Bversion%7D.tar.gz +Patch0: %{name}-0.2.2-vala.patch +Patch1: ethos-0.2.2-gtk3.patch +Patch2: ethos-0.2.2-fix-plugin-loader-dir.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: gtk3-devel +BuildRequires: gjs-devel +BuildRequires: python-devel +BuildRequires: pygtk2-devel +BuildRequires: vala-devel +BuildRequires: vala-tools + +%description +Ethos is a plugin framework that is written in C using the GLib and GObject +libraries. The goal is to have a single framework for applications that lower +the barrier to entry for extensions. To enable as many communities as possible, +various language bindings are provided to allow extensions in the language of +choice. + +Ethos includes a GUI library as well named libethos-ui. This library provides +a gtk+ widget for managing plugins within your application. Typically, you can +simply add this to a "Plugins" tab in your applications preferences dialog. + +%package devel +Summary: Development package for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig +Requires: gobject-introspection-devel + +%description devel +Files for development with %{name}. + +%package docs +Summary: Documentation for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description docs +Documentation for development with %{name}. + +%package python +Summary: Python bindings for %{name} +Group: Development/Languages +Requires: %{name} = %{version}-%{release} +Requires: gnome-python2 +Requires: pygtk2 + +%description python +Python bindings for development with %{name}. + +%package vala +Summary: Vala bindings for %{name} +Group: Development/Languages +Requires: %{name} = %{version}-%{release} +Requires: vala +BuildArch: noarch + +%description vala +Vala bindings for development with %{name}. + +%prep +%setup -q +%patch0 -p1 -b .vala +%patch1 -p1 -b .gtk3 +%patch2 -p1 -b .plugin-loader-dir + +%build +%configure --disable-static --enable-introspection --enable-python + +# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + +make %{?_smp_mflags} V=1 + +%install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} INSTALL='install -p' + +#Remove libtool archives. +find %{buildroot} -name '*.la' -exec rm -f {} ';' + +%find_lang %{name} + +%clean +rm -rf %{buildroot} + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc COPYING AUTHORS README NEWS +%{_libdir}/libethos*.so.* +%dir %{_libdir}/ethos +%dir %{_libdir}/ethos/plugin-loaders +%{_libdir}/ethos/plugin-loaders/libcloader.so.* +%{_libdir}/ethos/plugin-loaders/libjsloader.so.* +%{_libdir}/girepository-1.0/Ethos-1.0.typelib +%{_datadir}/ethos + +%files devel +%defattr(-,root,root,-) +%{_includedir}/ethos-1.0 +%{_libdir}/ethos/plugin-loaders/lib*.so +%{_libdir}/pkgconfig/ethos*1.0.pc +%{_libdir}/*.so +%{_datadir}/gir-1.0/Ethos-1.0.gir + +%files docs +%defattr(-,root,root,-) +%doc %{_datadir}/gtk-doc/html/ethos + +%files python +%defattr(-,root,root,-) +%{_libdir}/ethos/plugin-loaders/libpythonloader.so.* +%{_datadir}/pygtk/2.0/defs/ethos* +%{python_sitearch}/gtk-2.0/ethos +%{python_sitearch}/gtk-2.0/_ethos* + +%files vala +%defattr(-,root,root,-) +%{_datadir}/vala/vapi/ethos-1.0.vapi +%{_datadir}/vala/vapi/ethos-ui-1.0.vapi + +%changelog +* Tue May 03 2011 Tom Callaway spot@fedoraproject.org - 0.2.2-11 +- move to gtk3 +- fix plugin-loader-dir + +* Tue Feb 08 2011 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 0.2.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Feb 7 2011 Dan Horák <dan[at]danny.cz> 0.2.2-9 +- detect recent vala + +* Wed Sep 22 2010 Peter Robinson pbrobinson@gmail.com 0.2.2-8 +- Bump build + +* Wed Jul 21 2010 David Malcolm dmalcolm@redhat.com - 0.2.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Mon Jul 12 2010 Colin Walters walters@verbum.org - 0.2.2-6 +- Rebuild against new gobject-introspection + +* Sat Jan 9 2010 Peter Robinson pbrobinson@gmail.com 0.2.2-4 +- Review updates + +* Mon Dec 28 2009 Peter Robinson pbrobinson@gmail.com 0.2.2-3 +- Update bindings group + +* Thu Dec 17 2009 Peter Robinson pbrobinson@gmail.com 0.2.2-2 +- Fix license + +* Thu Nov 26 2009 Peter Robinson pbrobinson@gmail.com 0.2.2-1 +- Update to 0.2.2 final release + +* Fri Oct 16 2009 Peter Robinson pbrobinson@gmail.com 0.2.2-0.1 +- Initial packaging of 0.2.2 snapshot diff --git a/sources b/sources new file mode 100644 index 0000000..23b65f5 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +36cf1ef444a224556bba4d441c400300 ethos-0.2.2.tar.gz
commit c58f463525777a27738978219bf2cfcc57ff13e8 Author: Peter Robinson pbrobinson@gmail.com Date: Mon Aug 15 20:08:55 2011 +0100
package is dead
diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..bc1eaaa --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +This package it dead. diff --git a/ethos-0.2.2-fix-plugin-loader-dir.patch b/ethos-0.2.2-fix-plugin-loader-dir.patch deleted file mode 100644 index 74eaf65..0000000 --- a/ethos-0.2.2-fix-plugin-loader-dir.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up ethos-0.2.2/ethos/Makefile.am.plugin-loader-dir ethos-0.2.2/ethos/Makefile.am ---- ethos-0.2.2/ethos/Makefile.am.plugin-loader-dir 2011-05-03 15:33:21.778747881 -0400 -+++ ethos-0.2.2/ethos/Makefile.am 2011-05-03 15:33:47.025371361 -0400 -@@ -44,7 +44,7 @@ libethos_@ETHOS_API_VERSION@_la_CFLAGS = - -DLIBDIR=""$(libdir)"" \ - -DG_LOG_DOMAIN="Ethos" \ - -DG_DISABLE_DEPRECATED \ -- -DETHOS_PLUGIN_LOADERS_DIR=""$(prefix)/lib/ethos/plugin-loaders"" \ -+ -DETHOS_PLUGIN_LOADERS_DIR=""$(libdir)/ethos/plugin-loaders"" \ - $(ETHOS_MAINTAINER_CFLAGS) \ - $(ETHOS_DEBUG_CFLAGS) \ - $(ETHOS_CFLAGS) \ -diff -up ethos-0.2.2/ethos/Makefile.in.plugin-loader-dir ethos-0.2.2/ethos/Makefile.in ---- ethos-0.2.2/ethos/Makefile.in.plugin-loader-dir 2011-05-03 15:34:07.400067874 -0400 -+++ ethos-0.2.2/ethos/Makefile.in 2011-05-03 15:34:30.450724934 -0400 -@@ -372,7 +372,7 @@ libethos_@ETHOS_API_VERSION@_la_CFLAGS = - -DLIBDIR=""$(libdir)"" \ - -DG_LOG_DOMAIN="Ethos" \ - -DG_DISABLE_DEPRECATED \ -- -DETHOS_PLUGIN_LOADERS_DIR=""$(prefix)/lib/ethos/plugin-loaders"" \ -+ -DETHOS_PLUGIN_LOADERS_DIR=""$(libdir)/ethos/plugin-loaders"" \ - $(ETHOS_MAINTAINER_CFLAGS) \ - $(ETHOS_DEBUG_CFLAGS) \ - $(ETHOS_CFLAGS) \ diff --git a/ethos-0.2.2-gtk3.patch b/ethos-0.2.2-gtk3.patch deleted file mode 100644 index 378c904..0000000 --- a/ethos-0.2.2-gtk3.patch +++ /dev/null @@ -1,109 +0,0 @@ -diff -up ethos-0.2.2/configure.ac.gtk3 ethos-0.2.2/configure.ac ---- ethos-0.2.2/configure.ac.gtk3 2011-05-03 15:27:10.225456980 -0400 -+++ ethos-0.2.2/configure.ac 2011-05-03 15:27:10.231456906 -0400 -@@ -73,7 +73,7 @@ PKG_CHECK_MODULES(ETHOS, gobject-2.0 >= - AC_SUBST(ETHOS_CFLAGS) - AC_SUBST(ETHOS_LIBS) - --PKG_CHECK_MODULES(ETHOS_UI, gtk+-2.0 >= gtk_req_version) -+PKG_CHECK_MODULES(ETHOS_UI, gtk+-3.0 >= gtk_req_version) - AC_SUBST(ETHOS_UI_CFLAGS) - AC_SUBST(ETHOS_UI_LIBS) - -diff -up ethos-0.2.2/configure.gtk3 ethos-0.2.2/configure ---- ethos-0.2.2/configure.gtk3 2011-05-03 15:27:10.228456944 -0400 -+++ ethos-0.2.2/configure 2011-05-03 15:27:10.234456868 -0400 -@@ -12942,12 +12942,12 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_ETHOS_UI_CFLAGS="$ETHOS_UI_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.10""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.10") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 2.10""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 2.10") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_ETHOS_UI_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.10" 2>/dev/null` -+ pkg_cv_ETHOS_UI_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 2.10" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -12960,12 +12960,12 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_ETHOS_UI_LIBS="$ETHOS_UI_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.10""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.10") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 2.10""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 2.10") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_ETHOS_UI_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.10" 2>/dev/null` -+ pkg_cv_ETHOS_UI_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 2.10" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -12984,14 +12984,14 @@ else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- ETHOS_UI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= 2.10"` -+ ETHOS_UI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-3.0 >= 2.10"` - else -- ETHOS_UI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.10"` -+ ETHOS_UI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-3.0 >= 2.10"` - fi - # Put the nasty error message in config.log where it belongs - echo "$ETHOS_UI_PKG_ERRORS" >&5 - -- as_fn_error "Package requirements (gtk+-2.0 >= 2.10) were not met: -+ as_fn_error "Package requirements (gtk+-3.0 >= 2.10) were not met: - - $ETHOS_UI_PKG_ERRORS - -diff -up ethos-0.2.2/ethos/ethos-ui-manager-widget.c.gtk3 ethos-0.2.2/ethos/ethos-ui-manager-widget.c ---- ethos-0.2.2/ethos/ethos-ui-manager-widget.c.gtk3 2011-05-03 15:27:43.003054095 -0400 -+++ ethos-0.2.2/ethos/ethos-ui-manager-widget.c 2011-05-03 15:28:42.653322574 -0400 -@@ -320,7 +320,7 @@ show_error_dialog: - gtk_window_set_title (GTK_WINDOW (dialog), ""); - gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); - gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); -- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); -+ /* gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); */ - content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); - gtk_container_set_border_width (GTK_CONTAINER (content_area), 12); - -@@ -561,10 +561,6 @@ ethos_ui_manager_widget_init (EthosUIMan - manager_widget->priv->about = about; - manager_widget->priv->list_store = list_store; - -- if (gtk_about_dialog_set_url_hook (url_hook_cb, NULL, NULL) != NULL) { -- g_warning ("Ethos overwrote a previous GtkAboutDialog url hook" -- ". This may cause a bug in your application."); -- } - } - - /** -diff -up ethos-0.2.2/ethos-ui.pc.in.gtk3 ethos-0.2.2/ethos-ui.pc.in ---- ethos-0.2.2/ethos-ui.pc.in.gtk3 2009-11-07 22:39:13.000000000 -0500 -+++ ethos-0.2.2/ethos-ui.pc.in 2011-05-03 15:27:10.234456868 -0400 -@@ -8,4 +8,4 @@ Description: User interface widgets for - Version: @VERSION@ - Libs: -L${libdir} -lethos-ui-1.0 - Cflags: -I${includedir}/ethos-1.0 --Requires: ethos-1.0 gtk+-2.0 -+Requires: ethos-1.0 gtk+-3.0 -diff -up ethos-0.2.2/examples/vala/Makefile.am.gtk3 ethos-0.2.2/examples/vala/Makefile.am ---- ethos-0.2.2/examples/vala/Makefile.am.gtk3 2009-11-07 22:39:13.000000000 -0500 -+++ ethos-0.2.2/examples/vala/Makefile.am 2011-05-03 15:27:10.234456868 -0400 -@@ -13,7 +13,7 @@ basic_LDADD = \ - basic_sources = basic.c - basic_headers = basic.h - basic.c basic.h: $(srcdir)/basic.vala -- valac -C $(srcdir)/basic.vala --vapidir $(top_srcdir)/bindings/vala --pkg ethos-1.0 --pkg gtk+-2.0 -+ valac -C $(srcdir)/basic.vala --vapidir $(top_srcdir)/bindings/vala --pkg ethos-1.0 --pkg gtk+-3.0 - endif - - EXTRA_DIST = basic.vala diff --git a/ethos-0.2.2-vala.patch b/ethos-0.2.2-vala.patch deleted file mode 100644 index a0a3806..0000000 --- a/ethos-0.2.2-vala.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -up ethos-0.2.2/configure.ac.vala ethos-0.2.2/configure.ac ---- ethos-0.2.2/configure.ac.vala 2011-02-07 10:43:19.000000000 +0100 -+++ ethos-0.2.2/configure.ac 2011-02-07 10:43:50.000000000 +0100 -@@ -81,7 +81,7 @@ AM_CONDITIONAL(ENABLE_GLIB_TEST, test "x - - dnl = Enable Vala ========================================================== - enable_vala=no --PKG_CHECK_MODULES(VALA, vala-1.0, enable_vala=yes, enable_vala=no) -+PKG_CHECK_MODULES(VALA, libvala-0.12, enable_vala=yes, enable_vala=no) - if test "x$enable_vala" = "xyes"; then - VAPI_DIR=`pkg-config --variable=vapidir vala-1.0` - else -diff -up ethos-0.2.2/configure.vala ethos-0.2.2/configure ---- ethos-0.2.2/configure.vala 2011-02-07 10:43:15.000000000 +0100 -+++ ethos-0.2.2/configure 2011-02-07 10:43:37.000000000 +0100 -@@ -13045,12 +13045,12 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_VALA_CFLAGS="$VALA_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "vala-1.0""; } >&5 -- ($PKG_CONFIG --exists --print-errors "vala-1.0") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "libvala-0.12""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libvala-0.12") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_VALA_CFLAGS=`$PKG_CONFIG --cflags "vala-1.0" 2>/dev/null` -+ pkg_cv_VALA_CFLAGS=`$PKG_CONFIG --cflags "libvala-0.12" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -13063,12 +13063,12 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_VALA_LIBS="$VALA_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "vala-1.0""; } >&5 -- ($PKG_CONFIG --exists --print-errors "vala-1.0") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "libvala-0.12""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libvala-0.12") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_VALA_LIBS=`$PKG_CONFIG --libs "vala-1.0" 2>/dev/null` -+ pkg_cv_VALA_LIBS=`$PKG_CONFIG --libs "libvala-0.12" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -13087,9 +13087,9 @@ else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- VALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "vala-1.0"` -+ VALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libvala-0.12"` - else -- VALA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "vala-1.0"` -+ VALA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libvala-0.12"` - fi - # Put the nasty error message in config.log where it belongs - echo "$VALA_PKG_ERRORS" >&5 -@@ -13107,7 +13107,7 @@ $as_echo "yes" >&6; } - enable_vala=yes - fi - if test "x$enable_vala" = "xyes"; then -- VAPI_DIR=`pkg-config --variable=vapidir vala-1.0` -+ VAPI_DIR=`pkg-config --variable=vapidir libvala-0.12` - else - VAPI_DIR= - fi -diff -up ethos-0.2.2/examples/vala/basic.vala ethos-0.2.2/examples/vala/basic diff --git a/ethos.spec b/ethos.spec deleted file mode 100644 index ef0255e..0000000 --- a/ethos.spec +++ /dev/null @@ -1,173 +0,0 @@ -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} - -Name: ethos -Version: 0.2.2 -Release: 11%{?dist} -Summary: Plugin framework for GLib - -Group: System Environment/Libraries -License: LGPLv2+ -URL: http://git.dronelabs.com/ethos/about/ -Source0: http://ftp.dronelabs.com/sources/ethos/0.2/%%7Bname%7D-%%7Bversion%7D.tar.gz -Patch0: %{name}-0.2.2-vala.patch -Patch1: ethos-0.2.2-gtk3.patch -Patch2: ethos-0.2.2-fix-plugin-loader-dir.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: gtk3-devel -BuildRequires: gjs-devel -BuildRequires: python-devel -BuildRequires: pygtk2-devel -BuildRequires: vala-devel -BuildRequires: vala-tools - -%description -Ethos is a plugin framework that is written in C using the GLib and GObject -libraries. The goal is to have a single framework for applications that lower -the barrier to entry for extensions. To enable as many communities as possible, -various language bindings are provided to allow extensions in the language of -choice. - -Ethos includes a GUI library as well named libethos-ui. This library provides -a gtk+ widget for managing plugins within your application. Typically, you can -simply add this to a "Plugins" tab in your applications preferences dialog. - -%package devel -Summary: Development package for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: pkgconfig -Requires: gobject-introspection-devel - -%description devel -Files for development with %{name}. - -%package docs -Summary: Documentation for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -BuildArch: noarch - -%description docs -Documentation for development with %{name}. - -%package python -Summary: Python bindings for %{name} -Group: Development/Languages -Requires: %{name} = %{version}-%{release} -Requires: gnome-python2 -Requires: pygtk2 - -%description python -Python bindings for development with %{name}. - -%package vala -Summary: Vala bindings for %{name} -Group: Development/Languages -Requires: %{name} = %{version}-%{release} -Requires: vala -BuildArch: noarch - -%description vala -Vala bindings for development with %{name}. - -%prep -%setup -q -%patch0 -p1 -b .vala -%patch1 -p1 -b .gtk3 -%patch2 -p1 -b .plugin-loader-dir - -%build -%configure --disable-static --enable-introspection --enable-python - -# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool - -make %{?_smp_mflags} V=1 - -%install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} INSTALL='install -p' - -#Remove libtool archives. -find %{buildroot} -name '*.la' -exec rm -f {} ';' - -%find_lang %{name} - -%clean -rm -rf %{buildroot} - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%files -f %{name}.lang -%defattr(-,root,root,-) -%doc COPYING AUTHORS README NEWS -%{_libdir}/libethos*.so.* -%dir %{_libdir}/ethos -%dir %{_libdir}/ethos/plugin-loaders -%{_libdir}/ethos/plugin-loaders/libcloader.so.* -%{_libdir}/ethos/plugin-loaders/libjsloader.so.* -%{_libdir}/girepository-1.0/Ethos-1.0.typelib -%{_datadir}/ethos - -%files devel -%defattr(-,root,root,-) -%{_includedir}/ethos-1.0 -%{_libdir}/ethos/plugin-loaders/lib*.so -%{_libdir}/pkgconfig/ethos*1.0.pc -%{_libdir}/*.so -%{_datadir}/gir-1.0/Ethos-1.0.gir - -%files docs -%defattr(-,root,root,-) -%doc %{_datadir}/gtk-doc/html/ethos - -%files python -%defattr(-,root,root,-) -%{_libdir}/ethos/plugin-loaders/libpythonloader.so.* -%{_datadir}/pygtk/2.0/defs/ethos* -%{python_sitearch}/gtk-2.0/ethos -%{python_sitearch}/gtk-2.0/_ethos* - -%files vala -%defattr(-,root,root,-) -%{_datadir}/vala/vapi/ethos-1.0.vapi -%{_datadir}/vala/vapi/ethos-ui-1.0.vapi - -%changelog -* Tue May 03 2011 Tom Callaway spot@fedoraproject.org - 0.2.2-11 -- move to gtk3 -- fix plugin-loader-dir - -* Tue Feb 08 2011 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 0.2.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Feb 7 2011 Dan Horák <dan[at]danny.cz> 0.2.2-9 -- detect recent vala - -* Wed Sep 22 2010 Peter Robinson pbrobinson@gmail.com 0.2.2-8 -- Bump build - -* Wed Jul 21 2010 David Malcolm dmalcolm@redhat.com - 0.2.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Mon Jul 12 2010 Colin Walters walters@verbum.org - 0.2.2-6 -- Rebuild against new gobject-introspection - -* Sat Jan 9 2010 Peter Robinson pbrobinson@gmail.com 0.2.2-4 -- Review updates - -* Mon Dec 28 2009 Peter Robinson pbrobinson@gmail.com 0.2.2-3 -- Update bindings group - -* Thu Dec 17 2009 Peter Robinson pbrobinson@gmail.com 0.2.2-2 -- Fix license - -* Thu Nov 26 2009 Peter Robinson pbrobinson@gmail.com 0.2.2-1 -- Update to 0.2.2 final release - -* Fri Oct 16 2009 Peter Robinson pbrobinson@gmail.com 0.2.2-0.1 -- Initial packaging of 0.2.2 snapshot diff --git a/sources b/sources deleted file mode 100644 index 23b65f5..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -36cf1ef444a224556bba4d441c400300 ethos-0.2.2.tar.gz
commit 1692c798f1281125876eddc1fa7065ec16113e7d Author: Tom "spot" Callaway tcallawa@redhat.com Date: Tue May 3 15:57:42 2011 -0400
move to gtk3, fix plugin-loader dir
diff --git a/ethos-0.2.2-fix-plugin-loader-dir.patch b/ethos-0.2.2-fix-plugin-loader-dir.patch new file mode 100644 index 0000000..74eaf65 --- /dev/null +++ b/ethos-0.2.2-fix-plugin-loader-dir.patch @@ -0,0 +1,24 @@ +diff -up ethos-0.2.2/ethos/Makefile.am.plugin-loader-dir ethos-0.2.2/ethos/Makefile.am +--- ethos-0.2.2/ethos/Makefile.am.plugin-loader-dir 2011-05-03 15:33:21.778747881 -0400 ++++ ethos-0.2.2/ethos/Makefile.am 2011-05-03 15:33:47.025371361 -0400 +@@ -44,7 +44,7 @@ libethos_@ETHOS_API_VERSION@_la_CFLAGS = + -DLIBDIR=""$(libdir)"" \ + -DG_LOG_DOMAIN="Ethos" \ + -DG_DISABLE_DEPRECATED \ +- -DETHOS_PLUGIN_LOADERS_DIR=""$(prefix)/lib/ethos/plugin-loaders"" \ ++ -DETHOS_PLUGIN_LOADERS_DIR=""$(libdir)/ethos/plugin-loaders"" \ + $(ETHOS_MAINTAINER_CFLAGS) \ + $(ETHOS_DEBUG_CFLAGS) \ + $(ETHOS_CFLAGS) \ +diff -up ethos-0.2.2/ethos/Makefile.in.plugin-loader-dir ethos-0.2.2/ethos/Makefile.in +--- ethos-0.2.2/ethos/Makefile.in.plugin-loader-dir 2011-05-03 15:34:07.400067874 -0400 ++++ ethos-0.2.2/ethos/Makefile.in 2011-05-03 15:34:30.450724934 -0400 +@@ -372,7 +372,7 @@ libethos_@ETHOS_API_VERSION@_la_CFLAGS = + -DLIBDIR=""$(libdir)"" \ + -DG_LOG_DOMAIN="Ethos" \ + -DG_DISABLE_DEPRECATED \ +- -DETHOS_PLUGIN_LOADERS_DIR=""$(prefix)/lib/ethos/plugin-loaders"" \ ++ -DETHOS_PLUGIN_LOADERS_DIR=""$(libdir)/ethos/plugin-loaders"" \ + $(ETHOS_MAINTAINER_CFLAGS) \ + $(ETHOS_DEBUG_CFLAGS) \ + $(ETHOS_CFLAGS) \ diff --git a/ethos-0.2.2-gtk3.patch b/ethos-0.2.2-gtk3.patch new file mode 100644 index 0000000..378c904 --- /dev/null +++ b/ethos-0.2.2-gtk3.patch @@ -0,0 +1,109 @@ +diff -up ethos-0.2.2/configure.ac.gtk3 ethos-0.2.2/configure.ac +--- ethos-0.2.2/configure.ac.gtk3 2011-05-03 15:27:10.225456980 -0400 ++++ ethos-0.2.2/configure.ac 2011-05-03 15:27:10.231456906 -0400 +@@ -73,7 +73,7 @@ PKG_CHECK_MODULES(ETHOS, gobject-2.0 >= + AC_SUBST(ETHOS_CFLAGS) + AC_SUBST(ETHOS_LIBS) + +-PKG_CHECK_MODULES(ETHOS_UI, gtk+-2.0 >= gtk_req_version) ++PKG_CHECK_MODULES(ETHOS_UI, gtk+-3.0 >= gtk_req_version) + AC_SUBST(ETHOS_UI_CFLAGS) + AC_SUBST(ETHOS_UI_LIBS) + +diff -up ethos-0.2.2/configure.gtk3 ethos-0.2.2/configure +--- ethos-0.2.2/configure.gtk3 2011-05-03 15:27:10.228456944 -0400 ++++ ethos-0.2.2/configure 2011-05-03 15:27:10.234456868 -0400 +@@ -12942,12 +12942,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_ETHOS_UI_CFLAGS="$ETHOS_UI_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.10""; } >&5 +- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.10") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 2.10""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 2.10") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_ETHOS_UI_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.10" 2>/dev/null` ++ pkg_cv_ETHOS_UI_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 2.10" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -12960,12 +12960,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_ETHOS_UI_LIBS="$ETHOS_UI_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.10""; } >&5 +- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.10") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 2.10""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 2.10") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_ETHOS_UI_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.10" 2>/dev/null` ++ pkg_cv_ETHOS_UI_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 2.10" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -12984,14 +12984,14 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- ETHOS_UI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= 2.10"` ++ ETHOS_UI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-3.0 >= 2.10"` + else +- ETHOS_UI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.10"` ++ ETHOS_UI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-3.0 >= 2.10"` + fi + # Put the nasty error message in config.log where it belongs + echo "$ETHOS_UI_PKG_ERRORS" >&5 + +- as_fn_error "Package requirements (gtk+-2.0 >= 2.10) were not met: ++ as_fn_error "Package requirements (gtk+-3.0 >= 2.10) were not met: + + $ETHOS_UI_PKG_ERRORS + +diff -up ethos-0.2.2/ethos/ethos-ui-manager-widget.c.gtk3 ethos-0.2.2/ethos/ethos-ui-manager-widget.c +--- ethos-0.2.2/ethos/ethos-ui-manager-widget.c.gtk3 2011-05-03 15:27:43.003054095 -0400 ++++ ethos-0.2.2/ethos/ethos-ui-manager-widget.c 2011-05-03 15:28:42.653322574 -0400 +@@ -320,7 +320,7 @@ show_error_dialog: + gtk_window_set_title (GTK_WINDOW (dialog), ""); + gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); + gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); +- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); ++ /* gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); */ + content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); + gtk_container_set_border_width (GTK_CONTAINER (content_area), 12); + +@@ -561,10 +561,6 @@ ethos_ui_manager_widget_init (EthosUIMan + manager_widget->priv->about = about; + manager_widget->priv->list_store = list_store; + +- if (gtk_about_dialog_set_url_hook (url_hook_cb, NULL, NULL) != NULL) { +- g_warning ("Ethos overwrote a previous GtkAboutDialog url hook" +- ". This may cause a bug in your application."); +- } + } + + /** +diff -up ethos-0.2.2/ethos-ui.pc.in.gtk3 ethos-0.2.2/ethos-ui.pc.in +--- ethos-0.2.2/ethos-ui.pc.in.gtk3 2009-11-07 22:39:13.000000000 -0500 ++++ ethos-0.2.2/ethos-ui.pc.in 2011-05-03 15:27:10.234456868 -0400 +@@ -8,4 +8,4 @@ Description: User interface widgets for + Version: @VERSION@ + Libs: -L${libdir} -lethos-ui-1.0 + Cflags: -I${includedir}/ethos-1.0 +-Requires: ethos-1.0 gtk+-2.0 ++Requires: ethos-1.0 gtk+-3.0 +diff -up ethos-0.2.2/examples/vala/Makefile.am.gtk3 ethos-0.2.2/examples/vala/Makefile.am +--- ethos-0.2.2/examples/vala/Makefile.am.gtk3 2009-11-07 22:39:13.000000000 -0500 ++++ ethos-0.2.2/examples/vala/Makefile.am 2011-05-03 15:27:10.234456868 -0400 +@@ -13,7 +13,7 @@ basic_LDADD = \ + basic_sources = basic.c + basic_headers = basic.h + basic.c basic.h: $(srcdir)/basic.vala +- valac -C $(srcdir)/basic.vala --vapidir $(top_srcdir)/bindings/vala --pkg ethos-1.0 --pkg gtk+-2.0 ++ valac -C $(srcdir)/basic.vala --vapidir $(top_srcdir)/bindings/vala --pkg ethos-1.0 --pkg gtk+-3.0 + endif + + EXTRA_DIST = basic.vala diff --git a/ethos.spec b/ethos.spec index 847603a..ef0255e 100644 --- a/ethos.spec +++ b/ethos.spec @@ -2,7 +2,7 @@
Name: ethos Version: 0.2.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Plugin framework for GLib
Group: System Environment/Libraries @@ -10,9 +10,11 @@ License: LGPLv2+ URL: http://git.dronelabs.com/ethos/about/ Source0: http://ftp.dronelabs.com/sources/ethos/0.2/%%7Bname%7D-%%7Bversion%7D.tar.gz Patch0: %{name}-0.2.2-vala.patch +Patch1: ethos-0.2.2-gtk3.patch +Patch2: ethos-0.2.2-fix-plugin-loader-dir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gtk2-devel +BuildRequires: gtk3-devel BuildRequires: gjs-devel BuildRequires: python-devel BuildRequires: pygtk2-devel @@ -72,6 +74,8 @@ Vala bindings for development with %{name}. %prep %setup -q %patch0 -p1 -b .vala +%patch1 -p1 -b .gtk3 +%patch2 -p1 -b .plugin-loader-dir
%build %configure --disable-static --enable-introspection --enable-python @@ -134,6 +138,10 @@ rm -rf %{buildroot} %{_datadir}/vala/vapi/ethos-ui-1.0.vapi
%changelog +* Tue May 03 2011 Tom Callaway spot@fedoraproject.org - 0.2.2-11 +- move to gtk3 +- fix plugin-loader-dir + * Tue Feb 08 2011 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 0.2.2-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
commit 099cafa0d82659a288d92876509994f3c6960577 Author: Dennis Gilmore dennis@ausil.us Date: Tue Feb 8 12:42:45 2011 -0600
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/ethos.spec b/ethos.spec index f07a0d4..847603a 100644 --- a/ethos.spec +++ b/ethos.spec @@ -2,7 +2,7 @@
Name: ethos Version: 0.2.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Plugin framework for GLib
Group: System Environment/Libraries @@ -134,6 +134,9 @@ rm -rf %{buildroot} %{_datadir}/vala/vapi/ethos-ui-1.0.vapi
%changelog +* Tue Feb 08 2011 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 0.2.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Feb 7 2011 Dan Horák <dan[at]danny.cz> 0.2.2-9 - detect recent vala
commit c0a042f5064526bcafd883715d200a9bafb49837 Author: Dan Horák dan@danny.cz Date: Mon Feb 7 10:51:01 2011 +0100
- detect recent vala
diff --git a/ethos-0.2.2-vala.patch b/ethos-0.2.2-vala.patch new file mode 100644 index 0000000..a0a3806 --- /dev/null +++ b/ethos-0.2.2-vala.patch @@ -0,0 +1,69 @@ +diff -up ethos-0.2.2/configure.ac.vala ethos-0.2.2/configure.ac +--- ethos-0.2.2/configure.ac.vala 2011-02-07 10:43:19.000000000 +0100 ++++ ethos-0.2.2/configure.ac 2011-02-07 10:43:50.000000000 +0100 +@@ -81,7 +81,7 @@ AM_CONDITIONAL(ENABLE_GLIB_TEST, test "x + + dnl = Enable Vala ========================================================== + enable_vala=no +-PKG_CHECK_MODULES(VALA, vala-1.0, enable_vala=yes, enable_vala=no) ++PKG_CHECK_MODULES(VALA, libvala-0.12, enable_vala=yes, enable_vala=no) + if test "x$enable_vala" = "xyes"; then + VAPI_DIR=`pkg-config --variable=vapidir vala-1.0` + else +diff -up ethos-0.2.2/configure.vala ethos-0.2.2/configure +--- ethos-0.2.2/configure.vala 2011-02-07 10:43:15.000000000 +0100 ++++ ethos-0.2.2/configure 2011-02-07 10:43:37.000000000 +0100 +@@ -13045,12 +13045,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_VALA_CFLAGS="$VALA_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "vala-1.0""; } >&5 +- ($PKG_CONFIG --exists --print-errors "vala-1.0") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "libvala-0.12""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libvala-0.12") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_VALA_CFLAGS=`$PKG_CONFIG --cflags "vala-1.0" 2>/dev/null` ++ pkg_cv_VALA_CFLAGS=`$PKG_CONFIG --cflags "libvala-0.12" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -13063,12 +13063,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_VALA_LIBS="$VALA_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "vala-1.0""; } >&5 +- ($PKG_CONFIG --exists --print-errors "vala-1.0") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "libvala-0.12""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libvala-0.12") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_VALA_LIBS=`$PKG_CONFIG --libs "vala-1.0" 2>/dev/null` ++ pkg_cv_VALA_LIBS=`$PKG_CONFIG --libs "libvala-0.12" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -13087,9 +13087,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- VALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "vala-1.0"` ++ VALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libvala-0.12"` + else +- VALA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "vala-1.0"` ++ VALA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libvala-0.12"` + fi + # Put the nasty error message in config.log where it belongs + echo "$VALA_PKG_ERRORS" >&5 +@@ -13107,7 +13107,7 @@ $as_echo "yes" >&6; } + enable_vala=yes + fi + if test "x$enable_vala" = "xyes"; then +- VAPI_DIR=`pkg-config --variable=vapidir vala-1.0` ++ VAPI_DIR=`pkg-config --variable=vapidir libvala-0.12` + else + VAPI_DIR= + fi +diff -up ethos-0.2.2/examples/vala/basic.vala ethos-0.2.2/examples/vala/basic diff --git a/ethos.spec b/ethos.spec index b52661f..f07a0d4 100644 --- a/ethos.spec +++ b/ethos.spec @@ -2,13 +2,14 @@
Name: ethos Version: 0.2.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Plugin framework for GLib
Group: System Environment/Libraries License: LGPLv2+ URL: http://git.dronelabs.com/ethos/about/ Source0: http://ftp.dronelabs.com/sources/ethos/0.2/%%7Bname%7D-%%7Bversion%7D.tar.gz +Patch0: %{name}-0.2.2-vala.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel @@ -70,6 +71,7 @@ Vala bindings for development with %{name}.
%prep %setup -q +%patch0 -p1 -b .vala
%build %configure --disable-static --enable-introspection --enable-python @@ -132,6 +134,9 @@ rm -rf %{buildroot} %{_datadir}/vala/vapi/ethos-ui-1.0.vapi
%changelog +* Mon Feb 7 2011 Dan Horák <dan[at]danny.cz> 0.2.2-9 +- detect recent vala + * Wed Sep 22 2010 Peter Robinson pbrobinson@gmail.com 0.2.2-8 - Bump build
commit 09cbb8d05367814abf1afef9078218398b54b6c8 Author: Peter Robinson pbrobinson@gmail.com Date: Wed Sep 22 18:56:50 2010 +0100
bump build
diff --git a/ethos.spec b/ethos.spec index 36158b0..b52661f 100644 --- a/ethos.spec +++ b/ethos.spec @@ -2,7 +2,7 @@
Name: ethos Version: 0.2.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Plugin framework for GLib
Group: System Environment/Libraries
commit e757c3b6aa733825d85cec0ea4ec7d7454160daf Author: Peter Robinson pbrobinson@gmail.com Date: Wed Sep 22 18:55:42 2010 +0100
bump build
diff --git a/ethos.spec b/ethos.spec index 425580b..36158b0 100644 --- a/ethos.spec +++ b/ethos.spec @@ -1,15 +1,15 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-Name: ethos -Version: 0.2.2 -Release: 7%{?dist} -Summary: Plugin framework for GLib +Name: ethos +Version: 0.2.2 +Release: 7%{?dist} +Summary: Plugin framework for GLib
-Group: System Environment/Libraries -License: LGPLv2+ -URL: http://git.dronelabs.com/ethos/about/ -Source0: http://ftp.dronelabs.com/sources/ethos/0.2/%%7Bname%7D-%%7Bversion%7D.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Group: System Environment/Libraries +License: LGPLv2+ +URL: http://git.dronelabs.com/ethos/about/ +Source0: http://ftp.dronelabs.com/sources/ethos/0.2/%%7Bname%7D-%%7Bversion%7D.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel BuildRequires: gjs-devel @@ -43,7 +43,6 @@ Files for development with %{name}. Summary: Documentation for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: gtk-doc BuildArch: noarch
%description docs @@ -133,6 +132,9 @@ rm -rf %{buildroot} %{_datadir}/vala/vapi/ethos-ui-1.0.vapi
%changelog +* Wed Sep 22 2010 Peter Robinson pbrobinson@gmail.com 0.2.2-8 +- Bump build + * Wed Jul 21 2010 David Malcolm dmalcolm@redhat.com - 0.2.2-7 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
commit ae05bf3dc5b6fa7a81647c82c6156687927e3b4a Author: Fedora Release Engineering rel-eng@lists.fedoraproject.org Date: Wed Jul 28 13:57:12 2010 +0000
dist-git conversion
diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index d61d7a2..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: ethos -# $Id$ -NAME := ethos -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON)
commit a839c00920e5d75da893276851f3ff8a71fb2554 Author: dmalcolm dmalcolm@fedoraproject.org Date: Thu Jul 22 01:16:36 2010 +0000
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
diff --git a/ethos.spec b/ethos.spec index 99b8a60..425580b 100644 --- a/ethos.spec +++ b/ethos.spec @@ -2,7 +2,7 @@
Name: ethos Version: 0.2.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Plugin framework for GLib
Group: System Environment/Libraries @@ -133,6 +133,9 @@ rm -rf %{buildroot} %{_datadir}/vala/vapi/ethos-ui-1.0.vapi
%changelog +* Wed Jul 21 2010 David Malcolm dmalcolm@redhat.com - 0.2.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + * Mon Jul 12 2010 Colin Walters walters@verbum.org - 0.2.2-6 - Rebuild against new gobject-introspection
commit d3b3d8085bc73dfed970417a717d73527b2091ac Author: Colin Walters walters@fedoraproject.org Date: Mon Jul 12 19:27:50 2010 +0000
- Rebuild against new gobject-introspection
diff --git a/ethos.spec b/ethos.spec index 1a432ae..99b8a60 100644 --- a/ethos.spec +++ b/ethos.spec @@ -2,7 +2,7 @@
Name: ethos Version: 0.2.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Plugin framework for GLib
Group: System Environment/Libraries @@ -133,7 +133,7 @@ rm -rf %{buildroot} %{_datadir}/vala/vapi/ethos-ui-1.0.vapi
%changelog -* Mon Jul 12 2010 Colin Walters walters@verbum.org - 0.2.2-5 +* Mon Jul 12 2010 Colin Walters walters@verbum.org - 0.2.2-6 - Rebuild against new gobject-introspection
* Sat Jan 9 2010 Peter Robinson pbrobinson@gmail.com 0.2.2-4
commit ca2f377c33e46e44582fd131a224d3933cf4fc32 Author: Colin Walters walters@fedoraproject.org Date: Mon Jul 12 19:00:13 2010 +0000
- Rebuild against new gobject-introspection
diff --git a/ethos.spec b/ethos.spec index 799a320..1a432ae 100644 --- a/ethos.spec +++ b/ethos.spec @@ -2,7 +2,7 @@
Name: ethos Version: 0.2.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Plugin framework for GLib
Group: System Environment/Libraries @@ -133,6 +133,9 @@ rm -rf %{buildroot} %{_datadir}/vala/vapi/ethos-ui-1.0.vapi
%changelog +* Mon Jul 12 2010 Colin Walters walters@verbum.org - 0.2.2-5 +- Rebuild against new gobject-introspection + * Sat Jan 9 2010 Peter Robinson pbrobinson@gmail.com 0.2.2-4 - Review updates
commit 07579bf54645f45623ae7be35edfce58545fa550 Author: Peter Robinson pbrobinson@fedoraproject.org Date: Thu Jan 14 23:13:47 2010 +0000
- initial import
diff --git a/import.log b/import.log deleted file mode 100644 index e5c8d63..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -ethos-0_2_2-4_fc12:HEAD:ethos-0.2.2-4.fc12.src.rpm:1263510614
commit d13e9c63590c566ce4ee702995cea5dc5b753e9d Author: Peter Robinson pbrobinson@fedoraproject.org Date: Thu Jan 14 23:12:27 2010 +0000
- Initial import
diff --git a/.cvsignore b/.cvsignore index e69de29..39d23c0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +ethos-0.2.2.tar.gz diff --git a/ethos.spec b/ethos.spec new file mode 100644 index 0000000..799a320 --- /dev/null +++ b/ethos.spec @@ -0,0 +1,149 @@ +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} + +Name: ethos +Version: 0.2.2 +Release: 4%{?dist} +Summary: Plugin framework for GLib + +Group: System Environment/Libraries +License: LGPLv2+ +URL: http://git.dronelabs.com/ethos/about/ +Source0: http://ftp.dronelabs.com/sources/ethos/0.2/%%7Bname%7D-%%7Bversion%7D.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: gtk2-devel +BuildRequires: gjs-devel +BuildRequires: python-devel +BuildRequires: pygtk2-devel +BuildRequires: vala-devel +BuildRequires: vala-tools + +%description +Ethos is a plugin framework that is written in C using the GLib and GObject +libraries. The goal is to have a single framework for applications that lower +the barrier to entry for extensions. To enable as many communities as possible, +various language bindings are provided to allow extensions in the language of +choice. + +Ethos includes a GUI library as well named libethos-ui. This library provides +a gtk+ widget for managing plugins within your application. Typically, you can +simply add this to a "Plugins" tab in your applications preferences dialog. + +%package devel +Summary: Development package for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig +Requires: gobject-introspection-devel + +%description devel +Files for development with %{name}. + +%package docs +Summary: Documentation for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: gtk-doc +BuildArch: noarch + +%description docs +Documentation for development with %{name}. + +%package python +Summary: Python bindings for %{name} +Group: Development/Languages +Requires: %{name} = %{version}-%{release} +Requires: gnome-python2 +Requires: pygtk2 + +%description python +Python bindings for development with %{name}. + +%package vala +Summary: Vala bindings for %{name} +Group: Development/Languages +Requires: %{name} = %{version}-%{release} +Requires: vala +BuildArch: noarch + +%description vala +Vala bindings for development with %{name}. + +%prep +%setup -q + +%build +%configure --disable-static --enable-introspection --enable-python + +# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + +make %{?_smp_mflags} V=1 + +%install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} INSTALL='install -p' + +#Remove libtool archives. +find %{buildroot} -name '*.la' -exec rm -f {} ';' + +%find_lang %{name} + +%clean +rm -rf %{buildroot} + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc COPYING AUTHORS README NEWS +%{_libdir}/libethos*.so.* +%dir %{_libdir}/ethos +%dir %{_libdir}/ethos/plugin-loaders +%{_libdir}/ethos/plugin-loaders/libcloader.so.* +%{_libdir}/ethos/plugin-loaders/libjsloader.so.* +%{_libdir}/girepository-1.0/Ethos-1.0.typelib +%{_datadir}/ethos + +%files devel +%defattr(-,root,root,-) +%{_includedir}/ethos-1.0 +%{_libdir}/ethos/plugin-loaders/lib*.so +%{_libdir}/pkgconfig/ethos*1.0.pc +%{_libdir}/*.so +%{_datadir}/gir-1.0/Ethos-1.0.gir + +%files docs +%defattr(-,root,root,-) +%doc %{_datadir}/gtk-doc/html/ethos + +%files python +%defattr(-,root,root,-) +%{_libdir}/ethos/plugin-loaders/libpythonloader.so.* +%{_datadir}/pygtk/2.0/defs/ethos* +%{python_sitearch}/gtk-2.0/ethos +%{python_sitearch}/gtk-2.0/_ethos* + +%files vala +%defattr(-,root,root,-) +%{_datadir}/vala/vapi/ethos-1.0.vapi +%{_datadir}/vala/vapi/ethos-ui-1.0.vapi + +%changelog +* Sat Jan 9 2010 Peter Robinson pbrobinson@gmail.com 0.2.2-4 +- Review updates + +* Mon Dec 28 2009 Peter Robinson pbrobinson@gmail.com 0.2.2-3 +- Update bindings group + +* Thu Dec 17 2009 Peter Robinson pbrobinson@gmail.com 0.2.2-2 +- Fix license + +* Thu Nov 26 2009 Peter Robinson pbrobinson@gmail.com 0.2.2-1 +- Update to 0.2.2 final release + +* Fri Oct 16 2009 Peter Robinson pbrobinson@gmail.com 0.2.2-0.1 +- Initial packaging of 0.2.2 snapshot diff --git a/import.log b/import.log new file mode 100644 index 0000000..e5c8d63 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +ethos-0_2_2-4_fc12:HEAD:ethos-0.2.2-4.fc12.src.rpm:1263510614 diff --git a/sources b/sources index e69de29..23b65f5 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +36cf1ef444a224556bba4d441c400300 ethos-0.2.2.tar.gz
arch-excludes@lists.fedoraproject.org