adamwill pushed to owncloud (f21). "unbundle php-natxet-cssmin, add getid3 to the list of symlink hacks"

[notifications at fedoraproject.org]

>From 2e592659918d63d3f3cbe5e7b29c6e5c2edfd247 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam at redhat.com>
Date: Mon, 23 Feb 2015 14:29:59 -0800
Subject: unbundle php-natxet-cssmin, add getid3 to the list of symlink hacks


diff --git a/owncloud.spec b/owncloud.spec
index a285ee0..25d8670 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -1,6 +1,6 @@
 Name:           owncloud
 Version:        8.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Private file sync and share server
 
 License:        AGPLv3+ and MIT and BSD and CC-BY and CC-BY-SA and GPLv3 and Public Domain and (MPLv1.1 or GPLv2+ or LGPLv2+) and (MIT or GPL+) and (MIT or GPLv2) and ASL 2.0 and LGPLv3
@@ -127,6 +127,8 @@ Requires:       php-composer(bantu/ini-get-wrapper) >= 1.0.1
 # "ircmaxell/random-lib": "v1.0.0"
 # Also pulls in ircmaxell/security-lib which is a dep
 Requires:       php-composer(ircmaxell/random-lib) >= 1.0.0
+# "natxet/CssMin": "dev-master"
+Requires:       php-composer(natxet/CssMin) >= 3.0.2
 
 ## SabreDAV
 #Requires:       php-composer(sabre/dav) >= 1.8.0
@@ -252,15 +254,21 @@ cp %{SOURCE5} README.postgresql
 
 
 # Strip bundled libraries from global 3rdparty dir
-rm -r 3rdparty/{bantu,doctrine,guzzle,ircmaxell/random-lib,ircmaxell/security-lib,james-heinrich,kriswallsmith,pear,phpmailer/phpmailer/*,phpseclib,pimple,rackspace,sabre,symfony}
+rm -r 3rdparty/{bantu,doctrine,guzzle,ircmaxell/random-lib,ircmaxell/security-lib,james-heinrich,kriswallsmith,natxet,pear,phpmailer/phpmailer/*,phpseclib,pimple,rackspace,sabre,symfony}
 rm 3rdparty/{PEAR,PEAR5}.php
 # we need to symlink some annoying files back here, though...direct file
 # autoloading sucks. "files" sections of "autoload" statements in
 # composer.json files cause composer to basically hardcode the path to a
 # given file and require that exact path *every time the autoloader is
-# invoked*: I can't see an elegant way around that.
+# invoked*: I can't see an elegant way around that. "classmap" does much
+# the same. If we unbundle *all* of the 'files' or 'classmap' bundled
+# deps in such a way that they're laid out exactly the same as upstream
+# relative to /usr/share/php, then instead of doing this we could patch
+# $vendorDir in the composer loader files to be /usr/share/php.
 mkdir -p 3rdparty/kriswallsmith/assetic/src
+mkdir -p 3rdparty/natxet/CssMin/src
 mkdir -p 3rdparty/phpseclib/phpseclib/phpseclib/Crypt
+mkdir -p 3rdparty/james-heinrich/getid3/getid3
 
 # individual core apps now bundle libs as well - yay
 #rm -r apps/search_lucene/3rdparty/Zend
@@ -302,12 +310,6 @@ rm -r apps/files_external/3rdparty/{Dropbox,google-api-php-client,aws-sdk-php}
 # Used in date localization: lib/private/l10n.php
 # Should be straightforward to unbundle
 
-## 3rdparty/natxet/CssMin
-# "natxet/CssMin": "dev-master"
-#
-# Used for optional CSS minification
-# Review request: https://bugzilla.redhat.com/show_bug.cgi?id=1177692
-
 # ===== END BUNDLING NOTES =====
 
 # clean up content
@@ -377,6 +379,8 @@ install -Dpm 644 %{SOURCE6} \
 ln -s %{_datadir}/php/PHPMailer/class.{phpmailer.php,pop3.php,smtp.php}    %{buildroot}%{_datadir}/%{name}/3rdparty/phpmailer/phpmailer
 ln -s %{_datadir}/php/Assetic/functions.php %{buildroot}%{_datadir}/%{name}/3rdparty/kriswallsmith/assetic/src/functions.php
 ln -s %{_datadir}/pear/Crypt/Random.php %{buildroot}%{_datadir}/%{name}/3rdparty/phpseclib/phpseclib/phpseclib/Crypt/Random.php
+ln -s %{_datadir}/php/natxet/CssMin/src/CssMin.php %{buildroot}%{_datadir}/%{name}/3rdparty/natxet/CssMin/src/
+ln -s %{_datadir}/php/getid3/getid3.php %{buildroot}%{_datadir}/%{name}/3rdparty/james-heinrich/getid3/getid3/
 
 
 %if 0%{?rhel} < 7
@@ -460,6 +464,9 @@ fi
 
 
 %changelog
+* Mon Feb 23 2015 Adam Williamson <awilliam at redhat.com> - 8.0.0-4
+- unbundle php-natxet-cssmin, add getid3 to the list of symlink hacks
+
 * Mon Feb 23 2015 Adam Williamson <awilliam at redhat.com> - 8.0.0-3
 - merge second version of Apache/Nginx config changes into 8.x build
 - backport upstream PR #14119 to fix OC for DBAL 2.5.1
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/owncloud.git/commit/?h=f21&id=2e592659918d63d3f3cbe5e7b29c6e5c2edfd247