Author: glen Date: Mon Apr 11 07:41:48 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- fixup horde dirs
---- Files affected:
packages/horde/php-horde-Horde_Core:
php-horde-Horde_Core.spec (1.1 -> 1.2)
packages/horde/php-horde-Horde_Kolab_Session:
php-horde-Horde_Kolab_Session.spec (1.1 -> 1.2)
packages/horde/php-horde-Horde_Mime_Viewer:
php-horde-Horde_Mime_Viewer.spec (1.1 -> 1.2)
packages/horde/php-horde-Horde_Text_Diff:
php-horde-Horde_Text_Diff.spec (1.1 -> 1.2)
packages/horde/php-horde-Horde_Text_Filter_Csstidy:
php-horde-Horde_Text_Filter_Csstidy.spec (1.1 -> 1.2)
packages/horde/php-horde-Horde_Text_Flowed:
php-horde-Horde_Text_Flowed.spec (1.1 -> 1.2)
packages/php-pear:
php-pear.spec (1.69 -> 1.70)
---- Diffs:
================================================================
Index: packages/horde/php-horde-Horde_Core/php-horde-Horde_Core.spec
diff -u packages/horde/php-horde-Horde_Core/php-horde-Horde_Core.spec:1.1
packages/horde/php-horde-Horde_Core/php-horde-Horde_Core.spec:1.2
--- packages/horde/php-horde-Horde_Core/php-horde-Horde_Core.spec:1.1 Sun Apr
10 23:38:04 2011
+++ packages/horde/php-horde-Horde_Core/php-horde-Horde_Core.spec Mon Apr
11 09:41:43 2011
@@ -86,6 +86,8 @@
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define hordedir /usr/share/horde
+
# exclude optional dependencies
%define _noautoreq pear(Horde/Crypt.*) pear(Horde/Db.*)
pear(Horde/Editor.*) pear(Horde/Form.*) pear(Horde/Http.*)
pear(Horde/Icalendar.*) pear(Horde/Image.*) pear(Horde/Imap/Client.*)
pear(Horde/Kolab/Server.*) pear(Horde/Kolab/Session.*)
pear(Horde/Kolab/Storage.*) pear(Horde/Ldap.*) pear(Horde/Mail.*)
pear(Horde/Nls.*) pear(Horde/Oauth.*) pear(Horde/Routes.*)
pear(Horde/Service/Twitter.*) pear(Horde/SpellChecker.*)
pear(Horde/Text/Filter.*) pear(Horde/Tree.*) pear(Horde/Vfs.*) pear(Net/DNS2.*)
pear(Text/CAPTCHA.*) pear(Text/Figlet.*) pear(lzf.*)
@@ -98,14 +100,18 @@
%prep
%pear_package_setup
+mv ./%{php_pear_dir}/www/horde .
+
%build
packagexml2cl package.xml > ChangeLog
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{php_pear_dir}
+install -d $RPM_BUILD_ROOT{%{php_pear_dir},%{hordedir}}
%pear_package_install
+cp -a horde/* $RPM_BUILD_ROOT%{hordedir}
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -127,16 +133,15 @@
%{php_pear_dir}/Horde/Themes.php
%{php_pear_dir}/Horde/Config
%{php_pear_dir}/Horde/Core
-%{php_pear_dir}/Horde/Exception
+%{php_pear_dir}/Horde/Exception/*.php
%{php_pear_dir}/Horde/Registry
%{php_pear_dir}/Horde/Script
%{php_pear_dir}/Horde/Themes
%{php_pear_dir}/data/Horde_Core
-# XXX, move to /usr/share/horde?
-%dir %{php_pear_dir}/www
-%dir %{php_pear_dir}/www/horde
-%{php_pear_dir}/www/horde/js
+%dir %{hordedir}
+%dir %{hordedir}/js
+%{hordedir}/js/*.js
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -144,5 +149,8 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.2 2011/04/11 07:41:43 glen
+- fixup horde dirs
+
Revision 1.1 2011/04/10 21:38:04 glen
- horde h4 pear packages
================================================================
Index:
packages/horde/php-horde-Horde_Kolab_Session/php-horde-Horde_Kolab_Session.spec
diff -u
packages/horde/php-horde-Horde_Kolab_Session/php-horde-Horde_Kolab_Session.spec:1.1
packages/horde/php-horde-Horde_Kolab_Session/php-horde-Horde_Kolab_Session.spec:1.2
---
packages/horde/php-horde-Horde_Kolab_Session/php-horde-Horde_Kolab_Session.spec:1.1
Sun Apr 10 23:38:07 2011
+++
packages/horde/php-horde-Horde_Kolab_Session/php-horde-Horde_Kolab_Session.spec
Mon Apr 11 09:41:43 2011
@@ -55,7 +55,6 @@
%doc ChangeLog install.log
%doc optional-packages.txt
%{php_pear_dir}/.registry/.channel.*/*.reg
-%dir %{php_pear_dir}/Horde/Kolab
%{php_pear_dir}/Horde/Kolab/Session.php
%{php_pear_dir}/Horde/Kolab/Session
@@ -65,5 +64,8 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.2 2011/04/11 07:41:43 glen
+- fixup horde dirs
+
Revision 1.1 2011/04/10 21:38:07 glen
- horde h4 pear packages
================================================================
Index:
packages/horde/php-horde-Horde_Mime_Viewer/php-horde-Horde_Mime_Viewer.spec
diff -u
packages/horde/php-horde-Horde_Mime_Viewer/php-horde-Horde_Mime_Viewer.spec:1.1
packages/horde/php-horde-Horde_Mime_Viewer/php-horde-Horde_Mime_Viewer.spec:1.2
---
packages/horde/php-horde-Horde_Mime_Viewer/php-horde-Horde_Mime_Viewer.spec:1.1
Sun Apr 10 23:38:08 2011
+++ packages/horde/php-horde-Horde_Mime_Viewer/php-horde-Horde_Mime_Viewer.spec
Mon Apr 11 09:41:43 2011
@@ -1,4 +1,6 @@
# $Revision$, $Date$
+# TODO
+# - compress .js/.css
%define status stable
%define pearname Horde_Mime_Viewer
%include /usr/lib/rpm/macros.php
@@ -6,7 +8,7 @@
Name: php-horde-Horde_Mime_Viewer
Version: 1.0.0
Release: 1
-License: LGPL
+License: LGPL (PHP code), MIT and GPL (syntaxhighlighter)
Group: Development/Languages/PHP
Source0: http://pear.horde.org/get/%{pearname}-%{version}.tgz
# Source0-md5: ef9a0b5db98c8438306f148dc273cabe
@@ -30,6 +32,8 @@
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define hordedir /usr/share/horde
+
%description
Provides rendering drivers for MIME data.
@@ -38,14 +42,25 @@
%prep
%pear_package_setup
+mv ./%{php_pear_dir}/www/horde .
+
+# common licenses
+%{__rm} horde/js/syntaxhighlighter/LGPL-LICENSE
+%{__rm} horde/js/syntaxhighlighter/MIT-LICENSE
+
+# sources not needed runtime
+%{__rm} -r horde/js/syntaxhighlighter/src
+
%build
packagexml2cl package.xml > ChangeLog
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{php_pear_dir}
+install -d $RPM_BUILD_ROOT{%{php_pear_dir},%{hordedir}}
%pear_package_install
+cp -a horde/* $RPM_BUILD_ROOT%{hordedir}
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -57,11 +72,11 @@
%{php_pear_dir}/Horde/Mime/Viewer.php
%{php_pear_dir}/data/Horde_Mime_Viewer
-# TODO
-%dir %{php_pear_dir}/www
-%dir %{php_pear_dir}/www/horde
-%dir %{php_pear_dir}/www/horde/js
-%{php_pear_dir}/www/horde/js/syntaxhighlighter
+%dir %{hordedir}/js/syntaxhighlighter
+%dir %{hordedir}/js/syntaxhighlighter/scripts
+%{hordedir}/js/syntaxhighlighter/scripts/*.js
+%dir %{hordedir}/js/syntaxhighlighter/styles
+%{hordedir}/js/syntaxhighlighter/styles/*.css
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -69,6 +84,8 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.2 2011/04/11 07:41:43 glen
+- fixup horde dirs
+
Revision 1.1 2011/04/10 21:38:08 glen
- horde h4 pear packages
-
================================================================
Index: packages/horde/php-horde-Horde_Text_Diff/php-horde-Horde_Text_Diff.spec
diff -u
packages/horde/php-horde-Horde_Text_Diff/php-horde-Horde_Text_Diff.spec:1.1
packages/horde/php-horde-Horde_Text_Diff/php-horde-Horde_Text_Diff.spec:1.2
--- packages/horde/php-horde-Horde_Text_Diff/php-horde-Horde_Text_Diff.spec:1.1
Sun Apr 10 23:38:12 2011
+++ packages/horde/php-horde-Horde_Text_Diff/php-horde-Horde_Text_Diff.spec
Mon Apr 11 09:41:44 2011
@@ -56,7 +56,6 @@
%doc optional-packages.txt
%doc docs/Horde_Text_Diff/*
%{php_pear_dir}/.registry/.channel.*/*.reg
-%dir %{php_pear_dir}/Horde/Text
%{php_pear_dir}/Horde/Text/Diff.php
%{php_pear_dir}/Horde/Text/Diff
@@ -66,5 +65,8 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.2 2011/04/11 07:41:44 glen
+- fixup horde dirs
+
Revision 1.1 2011/04/10 21:38:12 glen
- horde h4 pear packages
================================================================
Index:
packages/horde/php-horde-Horde_Text_Filter_Csstidy/php-horde-Horde_Text_Filter_Csstidy.spec
diff -u
packages/horde/php-horde-Horde_Text_Filter_Csstidy/php-horde-Horde_Text_Filter_Csstidy.spec:1.1
packages/horde/php-horde-Horde_Text_Filter_Csstidy/php-horde-Horde_Text_Filter_Csstidy.spec:1.2
---
packages/horde/php-horde-Horde_Text_Filter_Csstidy/php-horde-Horde_Text_Filter_Csstidy.spec:1.1
Sun Apr 10 23:38:12 2011
+++
packages/horde/php-horde-Horde_Text_Filter_Csstidy/php-horde-Horde_Text_Filter_Csstidy.spec
Mon Apr 11 09:41:44 2011
@@ -52,8 +52,6 @@
%defattr(644,root,root,755)
%doc ChangeLog install.log
%{php_pear_dir}/.registry/.channel.*/*.reg
-%dir %{php_pear_dir}/Horde/Text
-%dir %{php_pear_dir}/Horde/Text/Filter
%{php_pear_dir}/Horde/Text/Filter/Csstidy.php
%{php_pear_dir}/Horde/Text/Filter/Csstidy
@@ -63,6 +61,8 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.2 2011/04/11 07:41:44 glen
+- fixup horde dirs
+
Revision 1.1 2011/04/10 21:38:12 glen
- horde h4 pear packages
-
================================================================
Index:
packages/horde/php-horde-Horde_Text_Flowed/php-horde-Horde_Text_Flowed.spec
diff -u
packages/horde/php-horde-Horde_Text_Flowed/php-horde-Horde_Text_Flowed.spec:1.1
packages/horde/php-horde-Horde_Text_Flowed/php-horde-Horde_Text_Flowed.spec:1.2
---
packages/horde/php-horde-Horde_Text_Flowed/php-horde-Horde_Text_Flowed.spec:1.1
Sun Apr 10 23:38:12 2011
+++ packages/horde/php-horde-Horde_Text_Flowed/php-horde-Horde_Text_Flowed.spec
Mon Apr 11 09:41:44 2011
@@ -46,8 +46,6 @@
%defattr(644,root,root,755)
%doc ChangeLog install.log
%{php_pear_dir}/.registry/.channel.*/*.reg
-# TODO: dir owner?
-%dir %{php_pear_dir}/Horde/Text
%{php_pear_dir}/Horde/Text/Flowed.php
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -56,5 +54,8 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.2 2011/04/11 07:41:44 glen
+- fixup horde dirs
+
Revision 1.1 2011/04/10 21:38:12 glen
- horde h4 pear packages
================================================================
Index: packages/php-pear/php-pear.spec
diff -u packages/php-pear/php-pear.spec:1.69
packages/php-pear/php-pear.spec:1.70
--- packages/php-pear/php-pear.spec:1.69 Fri Apr 8 23:30:23 2011
+++ packages/php-pear/php-pear.spec Mon Apr 11 09:41:44 2011
@@ -3,7 +3,7 @@
Summary(pl.UTF-8): PEAR - rozszerzenie PHP i repozytorium aplikacji
Name: php-pear
Version: 1.3.6
-Release: 1
+Release: 2
Epoch: 4
License: Public Domain
Group: Development/Languages/PHP
@@ -90,6 +90,9 @@
%{php_pear_dir}/HTTP
%{php_pear_dir}/HTTP/WebDAV
%{php_pear_dir}/HTTP/WebDAV/Tools
+%{php_pear_dir}/Horde
+%{php_pear_dir}/Horde/Text
+%{php_pear_dir}/Horde/Xml
%{php_pear_dir}/I18N
%{php_pear_dir}/Image
%{php_pear_dir}/MP3
@@ -210,6 +213,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.70 2011/04/11 07:41:44 glen
+- fixup horde dirs
+
Revision 1.69 2011/04/08 21:30:23 glen
- 1.3.6: updated horde channel
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/horde/php-horde-Horde_Core/php-horde-Horde_Core.spec?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/horde/php-horde-Horde_Kolab_Session/php-horde-Horde_Kolab_Session.spec?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/horde/php-horde-Horde_Mime_Viewer/php-horde-Horde_Mime_Viewer.spec?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/horde/php-horde-Horde_Text_Diff/php-horde-Horde_Text_Diff.spec?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/horde/php-horde-Horde_Text_Filter_Csstidy/php-horde-Horde_Text_Filter_Csstidy.spec?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/horde/php-horde-Horde_Text_Flowed/php-horde-Horde_Text_Flowed.spec?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-pear/php-pear.spec?r1=1.69&r2=1.70&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
