removing egw-pear, moving jdots and pixelegg to main archive and build with main package

doc/rpm-build/debian.control

@@ -10,7 +10,6 @@ Package: egroupware-epl
 Architecture: all
 Depends:
  egroupware-epl-core (= ${binary:Version}),
- egroupware-epl-egw-pear (= ${binary:Version}),
  egroupware-epl-jdots (= ${binary:Version}),
  egroupware-epl-pixelegg (= ${binary:Version}),
  egroupware-epl-stylite (= ${binary:Version}),
@@ -65,10 +64,12 @@ Suggests: egroupware-epl,
  php5-mhash,
  php5-auth-pam,
  php-log
-Provides: egroupware-epl-addressbook, egroupware-epl-etemplate
+Provides: egroupware-epl-addressbook, egroupware-epl-etemplate, egroupware-epl-pear
 Replaces: egroupware-core, egroupware-addressbook, egroupware-epl-addressbook, egroupware-etemplate, egroupware-epl-etemplate,
- egroupware-syncml, egroupware-epl-syncml, egroupware-polls, egroupware-epl-polls, egroupware-phpsysinfo, egroupare-epl-phpsysinfo
+ egroupware-syncml, egroupware-epl-syncml, egroupware-polls, egroupware-epl-polls, egroupware-phpsysinfo, egroupare-epl-phpsysinfo,
-Conflicts: egroupware-syncml, egroupware-epl-syncml, egroupware-polls, egroupware-epl-polls, egroupware-phpsysinfo, egroupware-epl-phpsysinfo
+ egroupware-epl-pear, egroupware-pear
+Conflicts: egroupware-syncml, egroupware-epl-syncml, egroupware-polls, egroupware-epl-polls, egroupware-phpsysinfo, egroupware-epl-phpsysinfo,
+ egroupware-epl-pear, egroupware-pear
 Description: web-based groupware suite - core modules
  ${commondesc}
  .
@@ -345,3 +346,15 @@ Description: web-based groupware suite - wiki application
  ${commondesc}
  .
  This EGroupware application provides a wiki.
+
+Package: egroupware-epl-jdots
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, egroupware-epl-core (>= ${binary:Version}),
+Description: Stylite Template set for EGroupware EPL
+ ${commondesc}
+
+Package: egroupware-epl-pixelegg
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, egroupware-epl-core (>= ${binary:Version}), egroupware-epl-jdots (>= ${binary:Version})
+Description: Pixelegg Template set for EGroupware 14.1
+ ${commondesc}

doc/rpm-build/egroupware-epl.dsc

@@ -1,11 +1,11 @@
 Format: 1.0
 Source: egroupware-epl
-Binary: egroupware-epl, egroupware-epl-core, egroupware-epl-bookmarks, egroupware-epl-calendar, egroupware-epl-developer-tools, egroupware-epl-emailadmin, egroupware-epl-esync, egroupware-epl-mail, egroupware-epl-filemanager, egroupware-epl-infolog, egroupware-epl-manual, egroupware-epl-news-admin, egroupware-epl-notifications, egroupware-epl-phpbrain, egroupware-epl-projectmanager, egroupware-epl-registration, egroupware-epl-resources, egroupware-epl-sambaadmin, egroupware-epl-sitemgr, egroupware-epl-timesheet, egroupware-epl-tracker, egroupware-epl-wiki, egroupware-esync, egroupware-phpfreechat
+Binary: egroupware-epl, egroupware-epl-core, egroupware-epl-bookmarks, egroupware-epl-calendar, egroupware-epl-developer-tools, egroupware-epl-emailadmin, egroupware-epl-esync, egroupware-epl-mail, egroupware-epl-filemanager, egroupware-epl-infolog, egroupware-epl-manual, egroupware-epl-news-admin, egroupware-epl-notifications, egroupware-epl-phpbrain, egroupware-epl-projectmanager, egroupware-epl-registration, egroupware-epl-resources, egroupware-epl-sambaadmin, egroupware-epl-sitemgr, egroupware-epl-timesheet, egroupware-epl-tracker, egroupware-epl-wiki, egroupware-epl-jdots, egroupware-epl-pixelegg
 Architecture: all
-Version: 14.1.20141106-1
+Version: 14.2.20141211-1
 Maintainer: Ralf Becker <rb@stylite.de>
 Homepage: http://www.stylite.de/EPL
 Standards-Version: 3.8.0
 Build-Depends: debhelper (>= 5), po-debconf
-Debtransform-Tar: egroupware-epl-14.2.20141209.tar.gz
+Debtransform-Tar: egroupware-epl-14.2.20141211.tar.gz
 Debtransform-Files-Tar: debian.tar.gz phpfreechat_data_public.tar.gz

doc/rpm-build/egroupware-epl.spec

@@ -1,5 +1,5 @@
 Name: egroupware-epl
-Version: 14.2.20141209
+Version: 14.2.20141211
 Release:
 Summary: EGroupware is a web-based groupware suite written in php
 Group: Web/Database
@@ -82,11 +82,11 @@ Prefix: /usr/share
 Distribution: %{distribution}
 
 Source0: %{name}-%{version}.tar.gz
-Source1: %{name}-egw-pear-%{version}.tar.bz2
+#Source1: %{name}-egw-pear-%{version}.tar.bz2
 Source2: %{name}-stylite-%{version}.tar.bz2
-Source3: %{name}-pixelegg-%{version}.tar.bz2
+#Source3: %{name}-pixelegg-%{version}.tar.bz2
 Source4: %{name}-esyncpro-%{version}.tar.bz2
-Source5: %{name}-jdots-%{version}.tar.bz2
+#Source5: %{name}-jdots-%{version}.tar.bz2
 Source6: phpfreechat_data_public.tar.gz
 Source8: %{name}-rpmlintrc
 #Source9: %{name}-gallery-%{version}.tar.bz2
@@ -102,7 +102,6 @@ Buildarch: noarch
 AutoReqProv: no
 
 Requires: %{name}-core            = %{version}
-Requires: %{name}-egw-pear        = %{version}
 Requires: %{name}-stylite         = %{version}
 Requires: %{name}-jdots           = %{version}
 Requires: %{name}-esync           = %{version}
@@ -166,6 +165,8 @@ Obsoletes: %{egw_packagename}-felamimail
 Obsoletes: %{egw_packagename}-syncml
 Obsoletes: %{egw_packagename}-phpsysinfo
 Obsoletes: %{egw_packagename}-polls
+# packages no longer in 14.2
+Obsoletes: %{name}-egw-pear
 
 %post
 # Check binary paths and create links for opensuse/sles
@@ -223,18 +224,6 @@ Obsoletes: %{egw_packagename}-addressbook
 This package provides the EGroupware core applications
 (API, admin, etemplate, preferences and setup) plus addressbook.
 
-%package egw-pear
-Version: %{version}
-Summary: The EGroupware egw-pear application
-Group: Web/Database
-Requires: %{php}-pear
-AutoReqProv: no
-Requires: egw-core >= %{version}
-Provides: egw-pear %{version}
-Obsoletes: %{egw_packagename}-egw-pear
-%description egw-pear
-egw-pear contains modified pear classes necessary for EGroupware
-
 %package esync
 Version: %{version}
 Summary: The EGroupware eSync application
@@ -284,7 +273,6 @@ Group: Web/Database
 AutoReqProv: no
 Requires: egw-core >= %{version}
 Requires: %{php}-bcmath
-Requires: %{name}-egw-pear >= %{version}
 Obsoletes: %{egw_packagename}-emailadmin
 %description emailadmin
 EmailAdmin allow to maintain User email accounts
@@ -296,7 +284,6 @@ Group: Web/Database
 AutoReqProv: no
 Requires: egw-core >= %{version}
 Requires: %{name}-emailadmin >= %{version}
-Requires: %{name}-egw-pear >= %{version}
 Obsoletes: %{egw_packagename}-felamimail
 Obsoletes: %{name}-felamimail
 %description mail
@@ -308,7 +295,6 @@ Summary: The EGroupware filemanager application
 Group: Web/Database
 AutoReqProv: no
 Requires: egw-core >= %{version}
-Requires: %{name}-egw-pear >= %{version}
 Obsoletes: %{egw_packagename}-filemanager
 %description filemanager
 This is the filemanager app for EGroupware.
@@ -403,26 +389,6 @@ Obsoletes: %{egw_packagename}-phpfreechat
 %description phpfreechat
 Chat with other EGroupware users. A port of phpFreeChat for EGroupware.
 
-#%package phpsysinfo
-#Version: %{version}
-#Summary: The EGroupware phpsysinfo application
-#Group: Web/Database
-#AutoReqProv: no
-#Requires: egw-core >= %{version}
-#Obsoletes: %{egw_packagename}-phpsysinfo
-#%description phpsysinfo
-#This is the phpsysinfo app for EGroupware.
-
-#%package polls
-#Version: %{version}
-#Summary: The EGroupware polls application
-#Group: Web/Database
-#AutoReqProv: no
-#Requires: egw-core >= %{version}
-#Obsoletes: %{egw_packagename}-polls
-#%description polls
-#This is the polls app for EGroupware.
-
 %package projectmanager
 Version: %{version}
 Summary: The EGroupware projectmanager application
@@ -541,11 +507,11 @@ It also allows to remote wipe or view sync logs of all devices.
 echo "Detected php: %{php}"
 echo "post_install: %{post_install}"
 %setup0 -c -n %{egwdirname}
-%setup1 -T -D -a 1 -n %{egwdirname}
+#%setup1 -T -D -a 1 -n %{egwdirname}
 %setup2 -T -D -a 2 -n %{egwdirname}
-%setup3 -T -D -a 3 -n %{egwdirname}
+#%setup3 -T -D -a 3 -n %{egwdirname}
 %setup4 -T -D -a 4 -n %{egwdirname}
-%setup5 -T -D -a 5 -n %{egwdirname}
+#%setup5 -T -D -a 5 -n %{egwdirname}
 %setup6 -T -D -a 6 -n %{egwdirname}
 #%setup9 -T -D -a 9 -n %{egwdirname}
 %patch0 -p 0
@@ -638,10 +604,6 @@ ln -s ../../..%{egwdatadir}/header.inc.php
 %defattr(-,root,root)
 %{egwdir}/developer_tools
 
-%files egw-pear
-%defattr(-,root,root)
-%{egwdir}/egw-pear
-
 %files emailadmin
 %defattr(-,root,root)
 %{egwdir}/emailadmin
@@ -690,14 +652,6 @@ ln -s ../../..%{egwdatadir}/header.inc.php
 %defattr(-,root,root)
 %{egwdir}/phpfreechat
 
-#%files phpsysinfo
-#%defattr(-,root,root)
-#%{egwdir}/phpsysinfo
-
-#%files polls
-#%defattr(-,root,root)
-#%{egwdir}/polls
-
 %files projectmanager
 %defattr(-,root,root)
 %{egwdir}/projectmanager