From: Philip Chimento Date: Mon, 7 Mar 2011 21:36:22 +0000 (+0100) Subject: Fix RPM building X-Git-Tag: v0.9~126 X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=b1bc17e5adb7183932bb139fa9fe03adf09f3ce9;p=projects%2Fchimara%2Fchimara.git Fix RPM building There was more broken with RPM building than just the GSettings schemas, now it's fixed. --- diff --git a/chimara.spec.in b/chimara.spec.in index f908c9a..28de916 100644 --- a/chimara.spec.in +++ b/chimara.spec.in @@ -53,12 +53,13 @@ using %{name}. %setup -q %build -%configure --disable-static +%configure --disable-static --disable-schemas-compile make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -%makeinstall +# not macro makeinstall, this breaks stoopid GSETTINGS_RULES +make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' rm -f $RPM_BUILD_ROOT/usr/share/info/dir @@ -69,6 +70,11 @@ rm -rf $RPM_BUILD_ROOT /sbin/ldconfig /sbin/install-info %{_infodir}/nitfol.info %{_infodir}/dir || : +%post player +if [ $1 -eq 1 ] ; then + glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : +fi + %preun if [ $1 = 0 ] ; then /sbin/install-info --delete %{_infodir}/nitfol.info %{_infodir}/dir || : @@ -76,6 +82,9 @@ fi %postun -p /sbin/ldconfig +%postun player +glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : + %files %defattr(-,root,root,-) %doc %{_datadir}/doc/chimara/frotz/* @@ -85,6 +94,7 @@ fi %doc %{_infodir}/*.info* %{_libdir}/libchimara.so.* %{_libdir}/chimara/*.so +%{_libexecdir}/chimara/profile-analyze.py %files devel %defattr(-,root,root,-) @@ -104,8 +114,11 @@ fi %{_datadir}/chimara/chimara.ui %{_datadir}/chimara/chimara.menus %{_datadir}/chimara/style.css +%{_datadir}/glib-2.0/schemas/org.chimara-if.gschema.xml %changelog +* Mon Mar 7 2011 P. F. Chimento +- Added glib-compile-schemas invocations. * Fri Dec 4 2009 P. F. Chimento - 0.1-1 - Mended rpmlint warnings and errors. diff --git a/interpreters/glulxe/Makefile.am b/interpreters/glulxe/Makefile.am index 70a9d63..152e8d0 100644 --- a/interpreters/glulxe/Makefile.am +++ b/interpreters/glulxe/Makefile.am @@ -12,7 +12,7 @@ glulxe_la_LDFLAGS = -module $(PLUGIN_LIBTOOL_FLAGS) #glulxdump_CPPFLAGS = -I$(top_srcdir)/src/libchimara #glulxdump_LDADD = ../../libchimara/libchimara.la -pkglibexec_SCRIPTS = profile-analyze.py +dist_pkglibexec_SCRIPTS = profile-analyze.py glulxedocdir = $(datadir)/doc/$(PACKAGE)/glulxe dist_glulxedoc_DATA = README