Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
This commit is contained in:
commit
6382d1d98f
@ -45,4 +45,5 @@ VALUES
|
||||
('twitux','Twitux','http://live.gnome.org/DanielMorales/Twitux', now()),
|
||||
('twitvim','TwitVim','http://vim.sourceforge.net/scripts/script.php?script_id=2204', now()),
|
||||
('urfastr','urfastr','http://urfastr.net/', now()),
|
||||
('adium', 'Adium', 'http://www.adiumx.com/', now());
|
||||
('adium', 'Adium', 'http://www.adiumx.com/', now()),
|
||||
('yatca','Yatca','http://www.yatca.com/', now());
|
||||
|
@ -581,10 +581,8 @@ function common_shorten_link($url, $reverse = false)
|
||||
|
||||
function common_xml_safe_str($str)
|
||||
{
|
||||
$xmlStr = htmlentities(iconv('UTF-8', 'UTF-8//IGNORE', $str), ENT_NOQUOTES, 'UTF-8');
|
||||
|
||||
// Replace control, formatting, and surrogate characters with '*', ala Twitter
|
||||
return preg_replace('/[\p{Cc}\p{Cf}\p{Cs}]/u', '*', $str);
|
||||
// Neutralize control codes and surrogates
|
||||
return preg_replace('/[\p{Cc}\p{Cs}]/u', '*', $str);
|
||||
}
|
||||
|
||||
function common_tag_link($tag)
|
||||
|
@ -1,11 +1,14 @@
|
||||
# This version needs to match the tarball and unpacked directory name.
|
||||
%define LACVER 0.7.3
|
||||
|
||||
BuildRequires: php-pear
|
||||
BuildRequires: httpd-devel
|
||||
|
||||
Name: laconica
|
||||
Version: 0.7.2
|
||||
Version: %{LACVER}
|
||||
Release: 1%{?dist}
|
||||
License: GAGPL v3 or later
|
||||
Source: laconica-0.7.2.tar.gz
|
||||
Source: laconica-%{version}.tar.gz
|
||||
Group: Applications/Internet
|
||||
Summary: Laconica, the Open Source microblogging platform
|
||||
BuildArch: noarch
|
||||
@ -49,6 +52,8 @@ cp -a * %{buildroot}%{wwwpath}
|
||||
mkdir -p %{buildroot}%{_datadir}/laconica
|
||||
cp -a db %{buildroot}%{_datadir}/laconica/db
|
||||
|
||||
mkdir -p %{buildroot}%{_datadir}/laconica/avatar
|
||||
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
|
||||
cat > %{buildroot}%{_sysconfdir}/httpd/conf.d/laconica.conf <<"EOF"
|
||||
Alias /laconica/ "/var/www/laconica/"
|
||||
@ -74,6 +79,12 @@ rm -rf %buildroot
|
||||
%config(noreplace) %{_sysconfdir}/httpd/conf.d/laconica.conf
|
||||
|
||||
%changelog
|
||||
* Wed Apr 03 2009 Zach Copley <zach@controlyourself.ca> - 0.7.3
|
||||
- Changed version number to 0.7.3.
|
||||
|
||||
* Fri Mar 13 2009 Ken Sedgwick <ksedgwic@bonsai.com> - 0.7.2.1-1
|
||||
- Factored laconica version to the first line of the file.
|
||||
|
||||
* Wed Mar 03 2009 Zach Copley <zach@controlyourself.ca> - 0.7.2
|
||||
- Changed version number to 0.7.2.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user