[php-Monolog] Removed sub-packages (optional dependencies note in description instead)

[Shawn Iwinski]

commit c7ca025cc444ff052be83a9578e940ebfd9d2c0a
Author: Shawn Iwinski <siwinski at redhat.com>
Date:   Wed Jan 15 14:46:06 2014 -0500

    Removed sub-packages (optional dependencies note in description instead)

 php-Monolog.spec |  112 +++++++++--------------------------------------------
 1 files changed, 19 insertions(+), 93 deletions(-)
---
diff --git a/php-Monolog.spec b/php-Monolog.spec
index 45a33e7..a39bc3d 100644
--- a/php-Monolog.spec
+++ b/php-Monolog.spec
@@ -19,7 +19,7 @@
 
 Name:      php-%{lib_name}
 Version:   %{github_version}
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   Sends your logs to files, sockets, inboxes, databases and various web services
 
 Group:     Development/Libraries
@@ -61,6 +61,15 @@ Requires:      php-sockets
 Requires:      php-spl
 Requires:      php-xml
 
+# Removed sub-packages
+Provides:      %{name}-amqp   = %{version}-%{release}
+Provides:      %{name}-dynamo = %{version}-%{release}
+Provides:      %{name}-mongo  = %{version}-%{release}
+Provides:      %{name}-raven  = %{version}-%{release}
+
+# Optional dependency, but need this to enforce version
+Conflicts:     php-Raven < %{raven_min_ver}
+
 %description
 Monolog sends your logs to files, sockets, inboxes, databases and various web
 services. Special handlers allow you to build advanced logging strategies.
@@ -70,14 +79,14 @@ in your own libraries to keep a maximum of interoperability. You can also use it
 in your applications to make sure you can always use another compatible logger
 at a later time.
 
-Optional handlers:
-* %{name}-amqp
-      Allow sending log messages to an AMQP server (1.0+ required)
-* %{name}-dynamo
+Optional:
+* php-aws-sdk
       Allow sending log messages to AWS DynamoDB
-* %{name}-mongo
+* php-pecl-amqp
+      Allow sending log messages to an AMQP server (1.0+ required)
+* php-pecl-mongo
       Allow sending log messages to a MongoDB server
-* %{name}-raven
+* php-Raven >= %{raven_min_ver}
       Allow sending log messages to a Sentry server
 * https://github.com/doctrine/couchdb-client
       Allow sending log messages to a CouchDB server
@@ -90,62 +99,6 @@ Optional handlers:
 
 [1] https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md
 
-# ------------------------------------------------------------------------------
-
-%package amqp
-
-Summary:  Monolog AMQP handler
-
-Requires: php-%{lib_name} = %{version}-%{release}
-Requires: php-pecl(amqp)
-
-%description amqp
-Allow sending log messages to an AMQP server (1.0+ required).
-
-# ------------------------------------------------------------------------------
-
-%package dynamo
-
-Summary:  Monolog DynamoDB handler
-
-Requires: php-%{lib_name} = %{version}-%{release}
-Requires: php-aws-sdk
-
-Provides: %{name}-dynamodb = %{version}-%{release}
-
-%description dynamo
-Allow sending log messages to AWS services' DynamoDB.
-
-# ------------------------------------------------------------------------------
-
-%package mongo
-
-Summary:  Monolog MongoDB handler
-
-Requires: php-%{lib_name} = %{version}-%{release}
-Requires: php-pecl(mongo)
-
-Provides: %{name}-mongodb = %{version}-%{release}
-
-%description mongo
-Allow sending log messages to a MongoDB server.
-
-# ------------------------------------------------------------------------------
-
-%package raven
-
-Summary:  Monolog Sentry handler
-
-Requires: php-%{lib_name} = %{version}-%{release}
-Requires: php-Raven >= %{raven_min_ver}
-%{?raven_max_ver:Requires: php-Raven < %{raven_max_ver}}
-
-%description raven
-Allow sending log messages to a Sentry server.
-
-
-# ##############################################################################
-
 
 %prep
 %setup -q -n %{github_name}-%{github_commit}
@@ -177,42 +130,15 @@ rm -f tests/Monolog/Handler/MongoDBHandlerTest.php
 %{_bindir}/phpunit --include-path="./src:./tests" -d date.timezone="UTC"
 
 
-# ##############################################################################
-
-
 %files
 %doc LICENSE *.mdown doc composer.json
 %{_datadir}/php/%{lib_name}
-%exclude %{_datadir}/php/%{lib_name}/Handler/AmqpHandler.php
-%exclude %{_datadir}/php/%{lib_name}/Handler/DynamoDbHandler.php
-%exclude %{_datadir}/php/%{lib_name}/Handler/MongoDBHandler.php
-%exclude %{_datadir}/php/%{lib_name}/Handler/RavenHandler.php
-
-# ------------------------------------------------------------------------------
-
-%files amqp
-%{_datadir}/php/%{lib_name}/Handler/AmqpHandler.php
-
-# ------------------------------------------------------------------------------
-
-%files dynamo
-%{_datadir}/php/%{lib_name}/Handler/DynamoDbHandler.php
-
-# ------------------------------------------------------------------------------
-
-%files mongo
-%{_datadir}/php/%{lib_name}/Handler/MongoDBHandler.php
-
-# ------------------------------------------------------------------------------
-
-%files raven
-%{_datadir}/php/%{lib_name}/Handler/RavenHandler.php
-
-
-# ##############################################################################
 
 
 %changelog
+* Wed Jan 15 2014 Shawn Iwinski <shawn.iwinski at gmail.com> 1.7.0-2
+- Removed sub-packages (optional dependencies note in description instead)
+
 * Mon Dec 30 2013 Shawn Iwinski <shawn.iwinski at gmail.com> 1.7.0-1
 - Updated to 1.7.0 (BZ #1030923)
 - Added dynamo sub-package