diff --git a/codepot/DEBIAN/Makefile.in b/codepot/DEBIAN/Makefile.in index f73ed462..b656ce8c 100644 --- a/codepot/DEBIAN/Makefile.in +++ b/codepot/DEBIAN/Makefile.in @@ -116,6 +116,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PREFIX = @PREFIX@ RM = @RM@ +RMDIR = @RMDIR@ SBINDIR = @SBINDIR@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff --git a/codepot/Makefile.am b/codepot/Makefile.am index 453665a5..3a215b72 100644 --- a/codepot/Makefile.am +++ b/codepot/Makefile.am @@ -5,6 +5,20 @@ SUBDIRS = etc src EXTRA_DIST = README mkmf.sh DEBIAN +install-data-hook: + $(INSTALL) -d "$(DESTDIR)@DEPOTDIR@" + $(INSTALL) -d "$(DESTDIR)@DEPOTDIR@/svnrepo" + $(INSTALL) -d "$(DESTDIR)@DEPOTDIR@/files" + $(INSTALL) -d "$(DESTDIR)@LOGDIR@" + $(INSTALL) -d "$(DESTDIR)@CACHEDIR@" + +uninstall-hook: + $(RMDIR) "$(DESTDIR)@DEPOTDIR@/svnrepo" + $(RMDIR) "$(DESTDIR)@DEPOTDIR@/files" + $(RMDIR) "$(DESTDIR)@DEPOTDIR@" + $(RMDIR) "$(DESTDIR)@LOGDIR@" + $(RMDIR) "$(DESTDIR)@CACHEDIR@" + distclean-local: $(RM) -r autom4te.cache config.h.in~ "$(PACKAGE)-$(VERSION)" @@ -34,5 +48,4 @@ rpm: dist mkdir -p "@abs_top_builddir@/RPM/SRPMS" mkdir -p "@abs_top_builddir@/RPM/RPMS" cp codepot-@VERSION@.tar.gz "@abs_top_builddir@/RPM/SOURCES" - rpmbuild --define "_topdir @abs_top_builddir@/RPM" \ - -ba codepot.spec --target=@build_cpu@ + rpmbuild --define "_topdir @abs_top_builddir@/RPM" -ba codepot.spec diff --git a/codepot/Makefile.in b/codepot/Makefile.in index e3de6437..b43822a5 100644 --- a/codepot/Makefile.in +++ b/codepot/Makefile.in @@ -143,6 +143,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PREFIX = @PREFIX@ RM = @RM@ +RMDIR = @RMDIR@ SBINDIR = @SBINDIR@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -619,7 +620,8 @@ info: info-recursive info-am: install-data-am: - + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-recursive install-dvi-am: @@ -665,9 +667,11 @@ ps: ps-recursive ps-am: uninstall-am: - + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) uninstall-hook .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive + ctags-recursive install-am install-data-am install-strip \ + tags-recursive uninstall-am .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ @@ -676,16 +680,30 @@ uninstall-am: distclean distclean-generic distclean-hdr distclean-local \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am + install-data install-data-am install-data-hook install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ + tags-recursive uninstall uninstall-am uninstall-hook +install-data-hook: + $(INSTALL) -d "$(DESTDIR)@DEPOTDIR@" + $(INSTALL) -d "$(DESTDIR)@DEPOTDIR@/svnrepo" + $(INSTALL) -d "$(DESTDIR)@DEPOTDIR@/files" + $(INSTALL) -d "$(DESTDIR)@LOGDIR@" + $(INSTALL) -d "$(DESTDIR)@CACHEDIR@" + +uninstall-hook: + $(RMDIR) "$(DESTDIR)@DEPOTDIR@/svnrepo" + $(RMDIR) "$(DESTDIR)@DEPOTDIR@/files" + $(RMDIR) "$(DESTDIR)@DEPOTDIR@" + $(RMDIR) "$(DESTDIR)@LOGDIR@" + $(RMDIR) "$(DESTDIR)@CACHEDIR@" + distclean-local: $(RM) -r autom4te.cache config.h.in~ "$(PACKAGE)-$(VERSION)" @@ -715,8 +733,7 @@ rpm: dist mkdir -p "@abs_top_builddir@/RPM/SRPMS" mkdir -p "@abs_top_builddir@/RPM/RPMS" cp codepot-@VERSION@.tar.gz "@abs_top_builddir@/RPM/SOURCES" - rpmbuild --define "_topdir @abs_top_builddir@/RPM" \ - -ba codepot.spec --target=@build_cpu@ + rpmbuild --define "_topdir @abs_top_builddir@/RPM" -ba codepot.spec # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/codepot/codepot.spec.in b/codepot/codepot.spec.in index 94845b70..f2f72f86 100644 --- a/codepot/codepot.spec.in +++ b/codepot/codepot.spec.in @@ -6,14 +6,15 @@ Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ Release: 1 License: GPL +Group: Applications/Utilities Source0: %{name}-%{version}.tar.gz -Requires: httpd php php-ldap php-mysql +Requires: httpd php php-ldap php-mysql subversion -BuildRequires: +#BuildRequires: BuildRoot: %{_tmppath}/%{name}-%{version}-root -%descriptoin +%description Codepot code repository manager %prep @@ -37,45 +38,35 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT %files -%defattr(-, root, root) +%defattr(-,root,root) + +/var/www/html/codepot + +%config(noreplace) /etc/codepot/codepot.ini +/etc/codepot/codepot.sql +/etc/codepot/codepot.a2ldap +/etc/codepot/repo.sh +/etc/codepot/start-commit +/etc/codepot/pre-commit +/etc/codepot/post-commit + +%attr(-,apache,apache) /var/lib/codepot/svnrepo +%attr(-,apache,apache) /var/lib/codepot/files +%attr(-,apache,apache) /var/log/codepot +%attr(-,apache,apache) /var/cache/codepot +%dir /var/lib/codepot/svnrepo +%dir /var/lib/codepot/files +%dir /var/log/codepot +%dir /var/cache/codepot %pre exit 0 %post -# create directories not handled by make install -[ -d "@CACHEDIR@" ] || { mkdir -p "@CACHEDIR@" && cachedir=1; } -[ -d "@LOGDIR@" ] || { mkdir -p "@LOGDIR@" && logdir=1; } -[ -d "@DEPOTDIR@/svnrepo" ] || { mkdir -p "@DEPOTDIR@/svnrepo" && svnrepodir=1; } -[ -d "@DEPOTDIR@/files" ] || { mkdir -p "@DEPOTDIR@/files" && filesdir=1; } - -GROUP=apache:apache -[ "${cachedir}" = "1" ] && { - chgrp -R "${GROUP}" "@CACHEDIR@" - chmod 0775 "@CACHEDIR@" -} -[ "${logdir}" = "1" ] && { - chgrp -R "${GROUP}" "@LOGDIR@" - chmod 0775 "@LOGDIR@" -} -[ "${svnrepodir}" = "1" ] && { - chgrp -R "${GROUP}" "@DEPOTDIR@/svnrepo" - chmod 0775 "@DEPOTDIR@/svnrepo" -} -[ "${filesdir}" = "1" ] && { - chgrp -R "${GROUP}" "@DEPOTDIR@/files" - chmod 0775 "@DEPOTDIR@/files" -} - exit 0 %preun exit 0 %postun -[ -d "@CACHEDIR@" ] && rmdir "@CACHEDIR@" 2>/dev/null -[ -d "@LOGDIR@" ] && rmdir "@LOGDIR@" 2>/dev/null -[ -d "@DEPOTDIR@/svnrepo" ] && rmdir "@DEPOTDIR@/svnrepo" 2>/dev/null -[ -d "@DEPOTDIR@/files" ] && rmdir "@DEPOTDIR@/files" 2>/dev/null -[ -d "@DEPOTDIR@" ] && rmdir "@DEPOTDIR@" 2>/dev/null exit 0 diff --git a/codepot/configure b/codepot/configure index 4ecd2c9b..60d3f7e9 100755 --- a/codepot/configure +++ b/codepot/configure @@ -575,6 +575,7 @@ wwwdir cfgdir depotdir SED +RMDIR RM GREP LD @@ -2482,6 +2483,98 @@ else RM="$ac_cv_prog_RM" fi +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}rmdir", so it can be a program name with args. +set dummy ${ac_tool_prefix}rmdir; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_RMDIR+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$RMDIR"; then + ac_cv_prog_RMDIR="$RMDIR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RMDIR="${ac_tool_prefix}rmdir" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +RMDIR=$ac_cv_prog_RMDIR +if test -n "$RMDIR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RMDIR" >&5 +$as_echo "$RMDIR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_RMDIR"; then + ac_ct_RMDIR=$RMDIR + # Extract the first word of "rmdir", so it can be a program name with args. +set dummy rmdir; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_RMDIR+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_RMDIR"; then + ac_cv_prog_ac_ct_RMDIR="$ac_ct_RMDIR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_RMDIR="rmdir" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_RMDIR=$ac_cv_prog_ac_ct_RMDIR +if test -n "$ac_ct_RMDIR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RMDIR" >&5 +$as_echo "$ac_ct_RMDIR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_RMDIR" = x; then + RMDIR="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + RMDIR=$ac_ct_RMDIR + fi +else + RMDIR="$ac_cv_prog_RMDIR" +fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}sed", so it can be a program name with args. set dummy ${ac_tool_prefix}sed; ac_word=$2 diff --git a/codepot/configure.ac b/codepot/configure.ac index 9ecf1145..781ceed2 100644 --- a/codepot/configure.ac +++ b/codepot/configure.ac @@ -13,6 +13,7 @@ dnl check common tools AC_CHECK_TOOL(LD, ld) AC_CHECK_TOOL(GREP, grep) AC_CHECK_TOOL(RM, rm) +AC_CHECK_TOOL(RMDIR, rmdir) AC_CHECK_TOOL(SED, sed) RM="$RM -f" diff --git a/codepot/etc/Makefile.in b/codepot/etc/Makefile.in index 84920be8..b9b71b94 100644 --- a/codepot/etc/Makefile.in +++ b/codepot/etc/Makefile.in @@ -115,6 +115,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PREFIX = @PREFIX@ RM = @RM@ +RMDIR = @RMDIR@ SBINDIR = @SBINDIR@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff --git a/codepot/src/Makefile.in b/codepot/src/Makefile.in index 4b695568..bf74b12e 100644 --- a/codepot/src/Makefile.in +++ b/codepot/src/Makefile.in @@ -153,6 +153,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PREFIX = @PREFIX@ RM = @RM@ +RMDIR = @RMDIR@ SBINDIR = @SBINDIR@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff --git a/codepot/src/codepot/Makefile.in b/codepot/src/codepot/Makefile.in index 8bc01793..d150546c 100644 --- a/codepot/src/codepot/Makefile.in +++ b/codepot/src/codepot/Makefile.in @@ -152,6 +152,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PREFIX = @PREFIX@ RM = @RM@ +RMDIR = @RMDIR@ SBINDIR = @SBINDIR@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff --git a/codepot/src/codepot/config/Makefile.in b/codepot/src/codepot/config/Makefile.in index 0ac4f118..339be262 100644 --- a/codepot/src/codepot/config/Makefile.in +++ b/codepot/src/codepot/config/Makefile.in @@ -112,6 +112,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PREFIX = @PREFIX@ RM = @RM@ +RMDIR = @RMDIR@ SBINDIR = @SBINDIR@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff --git a/codepot/src/codepot/controllers/Makefile.in b/codepot/src/codepot/controllers/Makefile.in index a460aa3a..1af2b024 100644 --- a/codepot/src/codepot/controllers/Makefile.in +++ b/codepot/src/codepot/controllers/Makefile.in @@ -112,6 +112,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PREFIX = @PREFIX@ RM = @RM@ +RMDIR = @RMDIR@ SBINDIR = @SBINDIR@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff --git a/codepot/src/codepot/errors/Makefile.in b/codepot/src/codepot/errors/Makefile.in index 5faba6bf..88aa01fd 100644 --- a/codepot/src/codepot/errors/Makefile.in +++ b/codepot/src/codepot/errors/Makefile.in @@ -112,6 +112,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PREFIX = @PREFIX@ RM = @RM@ +RMDIR = @RMDIR@ SBINDIR = @SBINDIR@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff --git a/codepot/src/codepot/helpers/Makefile.in b/codepot/src/codepot/helpers/Makefile.in index e1548bb0..803ed633 100644 --- a/codepot/src/codepot/helpers/Makefile.in +++ b/codepot/src/codepot/helpers/Makefile.in @@ -112,6 +112,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PREFIX = @PREFIX@ RM = @RM@ +RMDIR = @RMDIR@ SBINDIR = @SBINDIR@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff --git a/codepot/src/codepot/hooks/Makefile.in b/codepot/src/codepot/hooks/Makefile.in index 6e267f26..2a542e62 100644 --- a/codepot/src/codepot/hooks/Makefile.in +++ b/codepot/src/codepot/hooks/Makefile.in @@ -112,6 +112,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PREFIX = @PREFIX@ RM = @RM@ +RMDIR = @RMDIR@ SBINDIR = @SBINDIR@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff --git a/codepot/src/codepot/language/Makefile.in b/codepot/src/codepot/language/Makefile.in index ac20b623..f6f98c79 100644 --- a/codepot/src/codepot/language/Makefile.in +++ b/codepot/src/codepot/language/Makefile.in @@ -128,6 +128,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PREFIX = @PREFIX@ RM = @RM@ +RMDIR = @RMDIR@ SBINDIR = @SBINDIR@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff --git a/codepot/src/codepot/language/english/Makefile.in b/codepot/src/codepot/language/english/Makefile.in index d2ab4823..d29a3493 100644 --- a/codepot/src/codepot/language/english/Makefile.in +++ b/codepot/src/codepot/language/english/Makefile.in @@ -112,6 +112,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PREFIX = @PREFIX@ RM = @RM@ +RMDIR = @RMDIR@ SBINDIR = @SBINDIR@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff --git a/codepot/src/codepot/language/indonesian/Makefile.in b/codepot/src/codepot/language/indonesian/Makefile.in index aecb56f8..34afb7b2 100644 --- a/codepot/src/codepot/language/indonesian/Makefile.in +++ b/codepot/src/codepot/language/indonesian/Makefile.in @@ -112,6 +112,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PREFIX = @PREFIX@ RM = @RM@ +RMDIR = @RMDIR@ SBINDIR = @SBINDIR@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff --git a/codepot/src/codepot/language/korean/Makefile.in b/codepot/src/codepot/language/korean/Makefile.in index aee213d6..86521974 100644 --- a/codepot/src/codepot/language/korean/Makefile.in +++ b/codepot/src/codepot/language/korean/Makefile.in @@ -112,6 +112,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PREFIX = @PREFIX@ RM = @RM@ +RMDIR = @RMDIR@ SBINDIR = @SBINDIR@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff --git a/codepot/src/codepot/libraries/Makefile.in b/codepot/src/codepot/libraries/Makefile.in index 0cf7d5cf..72186b3d 100644 --- a/codepot/src/codepot/libraries/Makefile.in +++ b/codepot/src/codepot/libraries/Makefile.in @@ -112,6 +112,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PREFIX = @PREFIX@ RM = @RM@ +RMDIR = @RMDIR@ SBINDIR = @SBINDIR@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff --git a/codepot/src/codepot/models/Makefile.in b/codepot/src/codepot/models/Makefile.in index 464884ed..ae861667 100644 --- a/codepot/src/codepot/models/Makefile.in +++ b/codepot/src/codepot/models/Makefile.in @@ -112,6 +112,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PREFIX = @PREFIX@ RM = @RM@ +RMDIR = @RMDIR@ SBINDIR = @SBINDIR@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff --git a/codepot/src/codepot/views/Makefile.in b/codepot/src/codepot/views/Makefile.in index 7245eb54..0703ec3b 100644 --- a/codepot/src/codepot/views/Makefile.in +++ b/codepot/src/codepot/views/Makefile.in @@ -112,6 +112,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PREFIX = @PREFIX@ RM = @RM@ +RMDIR = @RMDIR@ SBINDIR = @SBINDIR@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff --git a/codepot/src/codepot/views/projectbar.php b/codepot/src/codepot/views/projectbar.php index 22c6f196..baf10c75 100644 --- a/codepot/src/codepot/views/projectbar.php +++ b/codepot/src/codepot/views/projectbar.php @@ -51,7 +51,7 @@ function show_projectbar ($con, $banner, $page, $ctxmenuitems) print '