rpms/mcs/devel libmcs-0.7.1-sysconfdir.patch, NONE, 1.1 mcs.spec, 1.13, 1.14

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/mcs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19681

Modified Files:
	mcs.spec 
Added Files:
	libmcs-0.7.1-sysconfdir.patch 
Log Message:
* Wed Dec 23 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7.1-6
- Add --disable-kconfig to fix build requirements usage (#529696).
  The kconfig backend has never been built or included before.
- Fix MCS_SYSCONFDIR build config value, so /etc/mcs-backend file is found.
  Don't provide a default site-wide config file anymore. Making it default
  to "gconf" would switch backends for everyone from "default".


libmcs-0.7.1-sysconfdir.patch:
 buildsys.mk.in |    1 +
 extra.mk.in    |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE libmcs-0.7.1-sysconfdir.patch ---
diff -Nur libmcs-0.7.1-orig/buildsys.mk.in libmcs-0.7.1/buildsys.mk.in
--- libmcs-0.7.1-orig/buildsys.mk.in	2008-04-21 00:05:48.000000000 +0200
+++ libmcs-0.7.1/buildsys.mk.in	2009-12-23 23:40:12.000000000 +0100
@@ -65,6 +65,7 @@
 includesubdir ?= ${PACKAGE}
 mandir = @mandir@
 mansubdir ?= man1
+sysconfdir = @sysconfdir@
 
 OBJS1 = ${SRCS:.c=.o}
 OBJS2 = ${OBJS1:.cc=.o}
diff -Nur libmcs-0.7.1-orig/extra.mk.in libmcs-0.7.1/extra.mk.in
--- libmcs-0.7.1-orig/extra.mk.in	2008-04-21 00:05:48.000000000 +0200
+++ libmcs-0.7.1/extra.mk.in	2009-12-23 23:40:26.000000000 +0100
@@ -7,3 +7,4 @@
 KCONFIG_FLAGS = @KCONFIG_FLAGS@
 KCONFIG_LIBS = @KCONFIG_LIBS@
 plugindir = ${libdir}/mcs
+MCS_SYSCONFDIR = ${sysconfdir}


Index: mcs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mcs/devel/mcs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- mcs.spec	25 Jul 2009 11:55:19 -0000	1.13
+++ mcs.spec	23 Dec 2009 23:04:19 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           mcs
 Version:        0.7.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Configuration file abstraction system
 
 Group:          Applications/System
@@ -10,10 +10,14 @@ License:        BSD
 URL:            http://atheme.org
 
 Source0:        http://distfiles.atheme.org/libmcs-%{version}.tgz
+Patch0: libmcs-0.7.1-sysconfdir.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  GConf2-devel
 BuildRequires:  libmowgli-devel >= 0.4.0
+BuildRequires:  GConf2-devel
+# would be needed for kconfig support
+#BuildRequires:  kdelibs-devel
 
 %description
 mcs is a library and set of userland tools which abstract the storage of
@@ -77,10 +81,11 @@ This package contains the files necessar
 
 %prep
 %setup -q -n libmcs-%{version}
+%patch0 -p1 -b .sysconfdir
 
 # Make the build system more verbose
-perl -pi -e 's/^\.SILENT:.*$//' buildsys.mk.in
-#sed -i '\,^.SILENT:,d' buildsys.mk.in
+#perl -pi -e 's/^\.SILENT:.*$//' buildsys.mk.in
+sed -i '\,^.SILENT:,d' buildsys.mk.in
 
 # The build generates a wrong SONAME, fix it.
 perl -pi -e "s/-soname=.*'/-soname=\\\$\{LIB\}.\\\$\{LIB_MAJOR\}'/" configure
@@ -88,6 +93,7 @@ perl -pi -e "s/-soname=.*'/-soname=\\\$\
 %build
 %configure \
     --enable-gconf \
+    --disable-kconfig \
     --disable-dependency-tracking
 
 make %{?_smp_mflags}
@@ -97,10 +103,10 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-echo "gconf" > $RPM_BUILD_ROOT%{_sysconfdir}/mcs-backend
-chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/mcs-backend
-
+# Example for a default site-wide storage backend setting:
+#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
+#echo "gconf" > $RPM_BUILD_ROOT%{_sysconfdir}/mcs-backend
+#chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/mcs-backend
 
 
 %clean
@@ -118,17 +124,24 @@ rm -rf $RPM_BUILD_ROOT
 %files libs
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README TODO
-%config(noreplace) %{_sysconfdir}/mcs-backend
+#%config(noreplace) %{_sysconfdir}/mcs-backend
 %{_libdir}/*.so.*
 %{_libdir}/mcs
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/*.so
-%{_includedir}/libmcs
+%{_includedir}/libmcs/
 %{_libdir}/pkgconfig/libmcs.pc
 
 %changelog
+* Wed Dec 23 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.7.1-6
+- Add --disable-kconfig to fix build requirements usage (#529696).
+  The kconfig backend has never been built or included before.
+- Fix MCS_SYSCONFDIR build config value, so /etc/mcs-backend file is found.
+  Don't provide a default site-wide config file anymore. Making it default
+  to "gconf" would switch backends for everyone from "default".
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild