Author: czarny Date: Sun Sep 11 20:55:34 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - r1276 - broken ogo-zidestore generation fix - init scripts permissions to 754 - rel 0.5
---- Files affected: SPECS: opengroupware.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/opengroupware.spec diff -u SPECS/opengroupware.spec:1.9 SPECS/opengroupware.spec:1.10 --- SPECS/opengroupware.spec:1.9 Sun Sep 11 21:51:57 2005 +++ SPECS/opengroupware.spec Sun Sep 11 22:55:29 2005 @@ -6,11 +6,13 @@ # - check init scripts # - cleanup and rel 1 # - scavange descriptions of subpackages -%define nightlybuild r1259 +# - change %files section to PLD-like +# - make a trigger bout further installing (making database, initializing it etc..) +%define nightlybuild r1276 %define ogo_makeflags -s %define zid_ver 1.3 %define xmlrpcd_ver 1.0a -%define datatrunk 200509011104 +%define datatrunk 200509081703 %define libversion 5.3 %define zide_v 1.5 @@ -18,11 +20,11 @@ Summary(pl): OpenGroupware Name: opengroupware.org Version: 1.1 -Release: 0.4 +Release: 0.5 License: GPL Group: Libraries Source0: http://download.opengroupware.org/nightly/sources/trunk/%{name}-trunk-%{nightlybuild}-%{datatrunk}.tar.gz -# Source0-md5: c141909fa83d0779f8e7931fbcb6bd3b +# Source0-md5: 828b30946e73081c8e9a415ee81a4c71 Source1: ogo-webui.init Source2: ogo-nhsd.init Source3: ogo-xmlrpcd.init @@ -471,6 +473,7 @@ %build . %{_libdir}/GNUstep-libFoundation/System/Library/Makefiles/GNUstep.sh +LIBARY_COMBO=gnu-fd-nil export LIBRARY_COMBO="gnu-fd-nil" ./configure \ --prefix=${RPM_BUILD_ROOT}%{_prefix} \ @@ -678,7 +681,7 @@ "%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-nhsd.init" \ >%{_sysconfdir}/rc.d/init.d/"%{NHSD_INIT_NAME}" chown root:root %{_sysconfdir}/rc.d/init.d/"%{NHSD_INIT_NAME}" - chmod 755 %{_sysconfdir}/rc.d/init.d/"%{NHSD_INIT_NAME}" + chmod 754 %{_sysconfdir}/rc.d/init.d/"%{NHSD_INIT_NAME}" chkconfig --add "%{NHSD_INIT_NAME}" /sbin/ldconfig fi @@ -692,7 +695,7 @@ "%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-nhsd.init" \ >%{_sysconfdir}/rc.d/init.d/"%{NHSD_INIT_NAME}" chown root:root %{_sysconfdir}/rc.d/init.d/"%{NHSD_INIT_NAME}" - chmod 755 %{_sysconfdir}/rc.d/init.d/"%{NHSD_INIT_NAME}" + chmod 754 %{_sysconfdir}/rc.d/init.d/"%{NHSD_INIT_NAME}" chkconfig --add "%{NHSD_INIT_NAME}" /sbin/ldconfig else @@ -703,7 +706,7 @@ "%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-nhsd.init" \ >%{_sysconfdir}/rc.d/init.d/"%{NHSD_INIT_NAME}" chown root:root %{_sysconfdir}/rc.d/init.d/"%{NHSD_INIT_NAME}" - chmod 755 %{_sysconfdir}/rc.d/init.d/"%{NHSD_INIT_NAME}" + chmod 754 %{_sysconfdir}/rc.d/init.d/"%{NHSD_INIT_NAME}" fi /sbin/ldconfig if [ -f "%{_sysconfdir}/rc.d/init.d/%{NHSD_INIT_NAME}" ]; then @@ -720,7 +723,7 @@ "%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-webui.init" \ >%{_sysconfdir}/rc.d/init.d/"%{OGO_INIT_NAME}" chown root:root %{_sysconfdir}/rc.d/init.d/"%{OGO_INIT_NAME}" - chmod 755 %{_sysconfdir}/rc.d/init.d/"%{OGO_INIT_NAME}" + chmod 754 %{_sysconfdir}/rc.d/init.d/"%{OGO_INIT_NAME}" chkconfig --add "%{OGO_INIT_NAME}" chkconfig "%{OGO_INIT_NAME}" on ## @@ -741,7 +744,7 @@ "%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-webui.init" \ >%{_sysconfdir}/rc.d/init.d/"%{OGO_INIT_NAME}" chown root:root %{_sysconfdir}/rc.d/init.d/"%{OGO_INIT_NAME}" - chmod 755 %{_sysconfdir}/rc.d/init.d/"%{OGO_INIT_NAME}" + chmod 754 %{_sysconfdir}/rc.d/init.d/"%{OGO_INIT_NAME}" chkconfig --add "%{OGO_INIT_NAME}" chkconfig "%{OGO_INIT_NAME}" on else @@ -752,7 +755,7 @@ "%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-webui.init" \ >%{_sysconfdir}/rc.d/init.d/"%{OGO_INIT_NAME}" chown root:root %{_sysconfdir}/rc.d/init.d/"%{OGO_INIT_NAME}" - chmod 755 %{_sysconfdir}/rc.d/init.d/"%{OGO_INIT_NAME}" + chmod 754 %{_sysconfdir}/rc.d/init.d/"%{OGO_INIT_NAME}" fi /sbin/ldconfig if [ -f "%{_sysconfdir}/rc.d/init.d/%{OGO_INIT_NAME}" ]; then @@ -769,7 +772,7 @@ "%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-xmlrpcd.init" \ >%{_sysconfdir}/rc.d/init.d/"%{XMLRPCD_INIT_NAME}" chown root:root %{_sysconfdir}/rc.d/init.d/"%{XMLRPCD_INIT_NAME}" - chmod 755 %{_sysconfdir}/rc.d/init.d/"%{XMLRPCD_INIT_NAME}" + chmod 754 %{_sysconfdir}/rc.d/init.d/"%{XMLRPCD_INIT_NAME}" chkconfig --add "%{XMLRPCD_INIT_NAME}" /sbin/ldconfig fi @@ -783,7 +786,7 @@ "%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-xmlrpcd.init" \ >%{_sysconfdir}/rc.d/init.d/"%{XMLRPCD_INIT_NAME}" chown root:root %{_sysconfdir}/rc.d/init.d/"%{XMLRPCD_INIT_NAME}" - chmod 755 %{_sysconfdir}/rc.d/init.d/"%{XMLRPCD_INIT_NAME}" + chmod 754 %{_sysconfdir}/rc.d/init.d/"%{XMLRPCD_INIT_NAME}" chkconfig --add "%{XMLRPCD_INIT_NAME}" /sbin/ldconfig else @@ -794,7 +797,7 @@ "%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-xmlrpcd.init" \ >%{_sysconfdir}/rc.d/init.d/"%{XMLRPCD_INIT_NAME}" chown root:root %{_sysconfdir}/rc.d/init.d/"%{XMLRPCD_INIT_NAME}" - chmod 755 %{_sysconfdir}/rc.d/init.d/"%{XMLRPCD_INIT_NAME}" + chmod 754 %{_sysconfdir}/rc.d/init.d/"%{XMLRPCD_INIT_NAME}" fi /sbin/ldconfig if [ -f "%{_sysconfdir}/rc.d/init.d/%{XMLRPCD_INIT_NAME}" ]; then @@ -806,12 +809,12 @@ if [ "$1" = "1" ]; then %{__sed} "s^ZIDESTORE_INIT_VERSION^%{ZIDESTORE_INIT_VERSION}^g; \ s^ZIDESTORE_INIT_PREFIX^%{ZIDESTORE_INIT_PREFIX}^g; \ - s^ZIDESTORE_SYSCONF^%{ZIDESTORE_SYSCONF}^g; \ + s^ZIDESTORE_SYSCONF^%{ZIDESTORE_SYSCONF}^g; \ s^GNUSTEP_DIR^%{GNUSTEP_DIR}^g" \ "%{_datadir}/zidestore-%{zide_v}/initscript_templates/ogo-zidestore.init" \ >%{_sysconfdir}/rc.d/init.d/"%{ZIDESTORE_INIT_NAME}" chown root:root %{_sysconfdir}/rc.d/init.d/"%{ZIDESTORE_INIT_NAME}" - chmod 755 %{_sysconfdir}/rc.d/init.d/"%{ZIDESTORE_INIT_NAME}" + chmod 754 %{_sysconfdir}/rc.d/init.d/"%{ZIDESTORE_INIT_NAME}" chkconfig --add "%{ZIDESTORE_INIT_NAME}" /sbin/ldconfig fi @@ -825,7 +828,7 @@ "%{_datadir}/zidestore-%{zide_v}/initscript_templates/ogo-zidestore.init" \ >%{_sysconfdir}/rc.d/init.d/"%{ZIDESTORE_INIT_NAME}" chown root:root %{_sysconfdir}/rc.d/init.d/"%{ZIDESTORE_INIT_NAME}" - chmod 755 %{_sysconfdir}/rc.d/init.d/"%{ZIDESTORE_INIT_NAME}" + chmod 754 %{_sysconfdir}/rc.d/init.d/"%{ZIDESTORE_INIT_NAME}" chkconfig --add "%{ZIDESTORE_INIT_NAME}" /sbin/ldconfig else @@ -836,7 +839,7 @@ "%{_datadir}/zidestore-%{zide_v}/initscript_templates/ogo-zidestore.init" \ >%{_sysconfdir}/init.d/"%{ZIDESTORE_INIT_NAME}" chown root:root %{_sysconfdir}/rc.d/init.d/"%{ZIDESTORE_INIT_NAME}" - chmod 755 %{_sysconfdir}/rc.d/init.d/"%{ZIDESTORE_INIT_NAME}" + chmod 754 %{_sysconfdir}/rc.d/init.d/"%{ZIDESTORE_INIT_NAME}" fi /sbin/ldconfig if [ -f "%{_sysconfdir}/rc.d/init.d/%{ZIDESTORE_INIT_NAME}" ]; then @@ -1336,12 +1339,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.9 2005/09/11 19:51:57 czarny -- added init scripts -- added macross for init filenames and syconfig filenames -- used %{__sed} macro -- removed debugging set -x -- more automatic init scripts generation +Revision 1.10 2005/09/11 20:55:29 czarny +- r1276 +- broken ogo-zidestore generation fix +- init scripts permissions to 754 +- rel 0.5 Revision 1.8 2005/09/10 19:13:57 czarny - scavenged the rest of included spec ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/opengroupware.spec?r1=1.9&r2=1.10&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
