From f00949946be4c7096fd304f94be41b863a0cbcb7 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Wed, 18 Sep 2013 00:25:11 +0200 Subject: [PATCH] minor fixes and cleanups in the scripts directory --- scripts/apidocs.config | 2 +- scripts/commandline.inc | 3 +- scripts/doxygen.tmpl | 2 +- ...tusnetversion.php => gnusocialversion.php} | 6 +- scripts/startdaemons.sh | 6 +- scripts/statusnet.spec | 98 ------------------- 6 files changed, 9 insertions(+), 108 deletions(-) rename scripts/{statusnetversion.php => gnusocialversion.php} (90%) delete mode 100644 scripts/statusnet.spec diff --git a/scripts/apidocs.config b/scripts/apidocs.config index fdbe35ba19..4b6c142078 100644 --- a/scripts/apidocs.config +++ b/scripts/apidocs.config @@ -25,7 +25,7 @@ DOXYFILE_ENCODING = UTF-8 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. -PROJECT_NAME = "StatusNet REST API" +PROJECT_NAME = "GNU Social REST API" # The PROJECT_NUMBER tag can be used to enter a project or revision number. # This could be handy for archiving the generated documentation or diff --git a/scripts/commandline.inc b/scripts/commandline.inc index b1955a32e3..a682f4489e 100644 --- a/scripts/commandline.inc +++ b/scripts/commandline.inc @@ -27,7 +27,6 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) { } define('STATUSNET', true); -define('LACONICA', true); // compatibility // Set various flags so we don't time out on long-running processes @@ -243,4 +242,4 @@ function printfv() $format = array_shift($args); return vprintf($format, $args); -} \ No newline at end of file +} diff --git a/scripts/doxygen.tmpl b/scripts/doxygen.tmpl index 15d03e3bb9..a3f2253ff7 100644 --- a/scripts/doxygen.tmpl +++ b/scripts/doxygen.tmpl @@ -25,7 +25,7 @@ DOXYFILE_ENCODING = UTF-8 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. -PROJECT_NAME = StatusNet +PROJECT_NAME = GNU Social # The PROJECT_NUMBER tag can be used to enter a project or revision number. # This could be handy for archiving the generated documentation or diff --git a/scripts/statusnetversion.php b/scripts/gnusocialversion.php similarity index 90% rename from scripts/statusnetversion.php rename to scripts/gnusocialversion.php index f83bc603c7..024e3330d8 100644 --- a/scripts/statusnetversion.php +++ b/scripts/gnusocialversion.php @@ -22,11 +22,11 @@ define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); -$helptext = <<= 5 -Requires: php-pear-Mail-Mime -Requires: php-curl -Requires: php-mysql -Requires: php-mbstring -Requires: php-gettext -Requires: php-xml -Requires: php-gd - -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%define apache_serverroot %(/usr/sbin/apxs -q DATADIR) -%define apache_sysconfdir %(/usr/sbin/apxs -q SYSCONFDIR) -%define wwwpath %{apache_serverroot}/%{name} -%define confpath %{_sysconfdir}/%{name} - -%description -From the ABOUT file: StatusNet (pronounced "luh-KAWN-ih-kuh") is a Free -and Open Source microblogging platform. It helps people in a -community, company or group to exchange short (140 character) messages -over the Web. Users can choose which people to "follow" and receive -only their friends' or colleagues' status messages. It provides a -similar service to sites like Twitter, Jaiku, and Plurk. - - -%prep -%setup -q - -%build - - -%install -mkdir -p %{buildroot}%{wwwpath} -cp -a * %{buildroot}%{wwwpath} - -mkdir -p %{buildroot}%{_datadir}/statusnet -cp -a db %{buildroot}%{_datadir}/statusnet/db - -mkdir -p %{buildroot}%{_datadir}/statusnet/avatar - -mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d -cat > %{buildroot}%{_sysconfdir}/httpd/conf.d/statusnet.conf <<"EOF" -Alias /statusnet/ "/var/www/statusnet/" - - - Options Indexes FollowSymLinks - AllowOverride All - Order allow,deny - Allow from all - -EOF - -%clean -rm -rf %buildroot - -%files -%defattr(-,root,root) -%dir %{wwwpath} -%{wwwpath}/* -%{_datadir}/statusnet/* -%attr(-,apache,apache) %dir %{_datadir}/statusnet/avatar -%doc COPYING README doc-src/* -%config(noreplace) %{_sysconfdir}/httpd/conf.d/statusnet.conf - -%changelog -* Wed Apr 03 2009 Zach Copley - 0.7.3 -- Changed version number to 0.7.3. - -* Fri Mar 13 2009 Ken Sedgwick - 0.7.2.1-1 -- Factored statusnet version to the first line of the file. - -* Wed Mar 03 2009 Zach Copley - 0.7.2 -- Changed version number to 0.7.2. - -* Sat Feb 28 2009 Ken Sedgwick - 0.7.1-1 -- Modified RPM for Fedora. - -* Thu Feb 13 2009 tuukka.pasanen@ilmi.fi -- packaged statusnet version 0.7.1 - -* Wed Feb 04 2009 tuukka.pasanen@ilmi.fi -- packaged statusnet version 0.7.0 using the buildservice spec file wizard -- 2.39.2