Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22996

Modified Files:
        php5.info 
Log Message:
  * Install logrotate script in php5-fpm package (Closes: #673558)
  * Remove php.ini from install and Conffiles since it's ucf is now dealing
    with it


Index: php5.info
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- php5.info   5 Dec 2012 18:02:18 -0000       1.7
+++ php5.info   21 Jan 2013 19:06:16 -0000      1.8
@@ -1,7 +1,7 @@
 Info2: <<
 Package: php5
 Version: 5.4.4
-Revision: 10.1
+Revision: 11.1
 Type: sapiver (20100525)
 ###
 BuildDepends: fink (>= 0.34.99.git), automake1.11, apache2-prefork-dev, 
aspell-dev, coreutils, cyrus-sasl2-dev, db53-aes, enchant1-dev, expat1, 
file-dev, freetds (>= 1:0.91-1), freetds-dev, freetype219, gd2, glib2-dev, 
gmp5, libapr.0-dev, libc-client1-dev, libcurl4, libevent2, libgcrypt, 
libicu36-dev, libjpeg8, libmcrypt, libmhash2, libonig2-dev, libodbc3-dev, 
libpcre1, libpng15, libtidy-0.99.0-dev, libtool2, libxml2, libxslt, 
mysql-unified-dev | libmysqlclient18-dev, libnetsnmp30-dev, netcat, 
openldap24-dev, openssl100-dev, postgresql91-dev, qdbm14, re2c, recode-dev, 
sed, sqlite3-dev, wrap
@@ -495,6 +495,8 @@
 mkdir -p %i/sbin
 mkdir -p %i/share/man/man8
 mkdir -p %i/etc/php5/fpm/pool.d
+mkdir -p %i/etc/logrotate.d
+install -m644 %b/fink/php5-fpm.logrotate %i/etc/logrotate.d/php5-fpm
 cp %b/fpm-build/sapi/fpm/php-fpm %i/sbin/php5-fpm
 cp %b/fpm-build/sapi/fpm/php-fpm.8 %i/share/man/man8/php5-fpm.8
 # we don't want the pool definitions on the main file itself:
@@ -541,11 +543,11 @@
 for i in apache2 apache2filter cgi cli embed fpm; do \
   install -d -m755 %i/etc/php5/$i; \
   ln -s %p/etc/php5/conf.d %i/etc/php5/$i/conf.d; \
-  if [ $i = cli ]; then \
-    install -m644 %i/share/php5/php.ini-production.cli %i/etc/php5/$i/php.ini; 
\
-  else \
-    install -m644 %i/share/php5/php.ini-production %i/etc/php5/$i/php.ini; \
-  fi \
+#  if [ $i = cli ]; then \
+#    install -m644 %i/share/php5/php.ini-production.cli 
%i/etc/php5/$i/php.ini; \
+#  else \
+#    install -m644 %i/share/php5/php.ini-production %i/etc/php5/$i/php.ini; \
+#  fi \
 done
 
 # If run in maintainer mode include test-results
@@ -2836,7 +2838,6 @@
   Provides: phpapi-%type_raw[sapiver]
   Depends: ucf, %N-common (= %v-%r), httpd, bzip2-shlibs, db53-aes-shlibs, 
libgettext8-shlibs, libiconv, libonig2-shlibs, libpcre1-shlibs, libxml2-shlibs, 
openssl100-shlibs, qdbm14-shlibs
   ConfFiles: <<
-    %p/etc/php5/cgi/php.ini
     %p/etc/apache2/mods-available/php5_cgi.conf
     %p/etc/apache2/mods-available/php5_cgi.load
   <<
@@ -2938,7 +2939,6 @@
   Package: %N-cli
   Provides: phpapi-%type_raw[sapiver]
   Depends: ucf, %N-common (= %v-%r), bzip2-shlibs, db53-aes-shlibs, 
libgettext8-shlibs, libiconv, libonig2-shlibs, libpcre1-shlibs, libxml2-shlibs, 
openssl100-shlibs, qdbm14-shlibs
-  ConfFiles: %p/etc/php5/cli/php.ini
   Files: <<
     etc/php5/cli
     bin/php5
@@ -2999,11 +2999,14 @@
   Package: %N-fpm
   Provides: phpapi-%type_raw[sapiver]
   Depends: ucf, %N-common (= %v-%r), httpd, daemonic, bzip2-shlibs, 
db53-aes-shlibs, libgettext8-shlibs, libiconv, libonig2-shlibs, 
libpcre1-shlibs, libxml2-shlibs, openssl100-shlibs, qdbm14-shlibs
+  Recommends: logrotate
   ConfFiles: <<
+    %p/etc/logrotate.d/php5-fpm
     %p/etc/php5/fpm/php-fpm.conf
     %p/etc/php5/fpm/pool.d/www.conf
   <<
   Files: <<
+    etc/logrotate.d
     etc/php5/fpm
     sbin/php5-fpm
     share/man/man8/php5-fpm.8


------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. SALE $99.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122412
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to