[PHP-CVS] cvs: php-src(PHP_4_3) / makerpm

2004-01-26 Thread Marcus Boerger 
helly   Mon Jan 26 19:32:35 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcmakerpm 
  Log:
  Use RPM variables
  # as discussed with ilia
  
  
http://cvs.php.net/diff.php/php-src/makerpm?r1=1.4.8.3r2=1.4.8.4ty=u
Index: php-src/makerpm
diff -u php-src/makerpm:1.4.8.3 php-src/makerpm:1.4.8.4
--- php-src/makerpm:1.4.8.3 Wed Jan 21 02:19:07 2004
+++ php-src/makerpm Mon Jan 26 19:32:35 2004
@@ -39,7 +39,7 @@
 Group: Networking/Daemons
 Source0: http://www.php.net/distributions/php-%{PACKAGE_VERSION}.tar.gz
 Copyright: PHP License
-BuildRoot: /tmp/php4-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
 Requires: webserver
 
 %description
@@ -90,15 +90,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/lib/apache
-install -m 755 .libs/libphp4.so $RPM_BUILD_ROOT/usr/lib/apache
-mkdir -p $RPM_BUILD_ROOT/usr/bin
-install -m 0755 sapi/cli/php $RPM_BUILD_ROOT/usr/bin
-install -m 0755 sapi/cgi/php $RPM_BUILD_ROOT/usr/bin/php_cgi
-mkdir -p $RPM_BUILD_ROOT/man/man1
-install -m 0755 sapi/cli/php.1 $RPM_BUILD_ROOT/man/man1
-mkdir -p $RPM_BUILD_ROOT/etc
-install -m 0755 php.ini-recommended $RPM_BUILD_ROOT/etc/php.ini
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/apache
+install -m 0755 .libs/libphp5.so $RPM_BUILD_ROOT%{_libdir}/apache
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -m 0755 sapi/cli/php $RPM_BUILD_ROOT%{_bindir}
+install -m 0755 sapi/cgi/php $RPM_BUILD_ROOT%{_bindir}/php_cgi
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+install -m 0755 sapi/cli/php.1 $RPM_BUILD_ROOT%{_mandir}/man1
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
+install -m 0755 php.ini-recommended $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -144,11 +144,11 @@
 
 %files
 %defattr(-,root,root)
-/usr/lib/apache/libphp4.so
-/usr/bin/php
-/usr/bin/php_cgi
-/man/man1/php.1*
-/etc/php.ini
+%{_libdir}/apache/libphp4.so
+%{_bindir}/php
+%{_bindir}/php_cgi
+%{_mandir}/man1/php.1*
+%{_sysconfdir}/php.ini
 
 %doc TODO CODING_STANDARDS CREDITS ChangeLog LICENSE NEWS
 EOF

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_3) / makerpm

2004-01-26 Thread Marcus Boerger 
helly   Mon Jan 26 20:24:18 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcmakerpm 
  Log:
  still version 4 here
  
http://cvs.php.net/diff.php/php-src/makerpm?r1=1.4.8.4r2=1.4.8.5ty=u
Index: php-src/makerpm
diff -u php-src/makerpm:1.4.8.4 php-src/makerpm:1.4.8.5
--- php-src/makerpm:1.4.8.4 Mon Jan 26 19:32:35 2004
+++ php-src/makerpm Mon Jan 26 20:24:17 2004
@@ -91,7 +91,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/apache
-install -m 0755 .libs/libphp5.so $RPM_BUILD_ROOT%{_libdir}/apache
+install -m 0755 .libs/libphp4.so $RPM_BUILD_ROOT%{_libdir}/apache
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 install -m 0755 sapi/cli/php $RPM_BUILD_ROOT%{_bindir}
 install -m 0755 sapi/cgi/php $RPM_BUILD_ROOT%{_bindir}/php_cgi

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_3) / makerpm

2004-01-21 Thread Marcus Boerger 
helly   Wed Jan 21 02:19:07 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcmakerpm 
  Log:
  Add these files to the actual package
  
http://cvs.php.net/diff.php/php-src/makerpm?r1=1.4.8.2r2=1.4.8.3ty=u
Index: php-src/makerpm
diff -u php-src/makerpm:1.4.8.2 php-src/makerpm:1.4.8.3
--- php-src/makerpm:1.4.8.2 Wed Jan 21 01:58:04 2004
+++ php-src/makerpm Wed Jan 21 02:19:07 2004
@@ -146,6 +146,9 @@
 %defattr(-,root,root)
 /usr/lib/apache/libphp4.so
 /usr/bin/php
+/usr/bin/php_cgi
+/man/man1/php.1*
+/etc/php.ini
 
 %doc TODO CODING_STANDARDS CREDITS ChangeLog LICENSE NEWS
 EOF

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_3) / makerpm

2004-01-20 Thread Marcus Boerger 
helly   Wed Jan 21 01:58:05 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcmakerpm 
  Log:
  Make this thing actually work again
  # look at changelog
  # pdf shouldn't be a default extension in this script it's seldom available
  
  
http://cvs.php.net/diff.php/php-src/makerpm?r1=1.4.8.1r2=1.4.8.2ty=u
Index: php-src/makerpm
diff -u php-src/makerpm:1.4.8.1 php-src/makerpm:1.4.8.2
--- php-src/makerpm:1.4.8.1 Mon Jan 19 14:58:57 2004
+++ php-src/makerpm Wed Jan 21 01:58:04 2004
@@ -50,7 +50,6 @@
 %prep
 %setup -q -n TARDIR
 #mkdir manual; cd manual  tar xzf $RPM_SOURCE_DIR/php3-manual.tar.gz
-chown -R root.root .
 ./buildconf
 
 %build
@@ -58,49 +57,61 @@
 # need to run this under sh or it breaks
 
 sh ./configure --prefix=/usr \
-   --with-config-file-path=/usr/lib \
+   --with-config-file-path=/etc \
--enable-force-cgi-redirect \
--enable-safe-mode \
--with-exec-dir=/usr/bin \
-   --with-mysql=/usr \
-   --with-pdflib=/usr \
-   --with-zlib=/usr \
+   --with-mysql \
+   --with-zlib \
--enable-xml \
--enable-wddx 
 
 make
-mv php php.keepme
+mv sapi/cgi/php php.keepme
 
 # then the apache module 
-rm config.cache
+test -f config.cache  rm -f config.cache
 sh ./configure --prefix=/usr \
--with-apxs=/usr/sbin/apxs \
--enable-versioning \
-   --with-config-file-path=/usr/lib \
+   --enable-cli \
+   --with-config-file-path=/etc \
--enable-safe-mode \
--with-exec-dir=/usr/bin \
-   --with-mysql=/usr \
-   --with-pdflib=/usr \
-   --with-zlib=/usr \
+   --with-mysql \
+   --with-zlib \
--enable-xml \
--enable-wddx 
 
 make clean
 make
 # restore cgi version
-mv php.keepme php
+mv php.keepme sapi/cgi/php
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/usr/lib/apache
 install -m 755 .libs/libphp4.so $RPM_BUILD_ROOT/usr/lib/apache
 mkdir -p $RPM_BUILD_ROOT/usr/bin
-install -m 755 php $RPM_BUILD_ROOT/usr/bin
+install -m 0755 sapi/cli/php $RPM_BUILD_ROOT/usr/bin
+install -m 0755 sapi/cgi/php $RPM_BUILD_ROOT/usr/bin/php_cgi
+mkdir -p $RPM_BUILD_ROOT/man/man1
+install -m 0755 sapi/cli/php.1 $RPM_BUILD_ROOT/man/man1
+mkdir -p $RPM_BUILD_ROOT/etc
+install -m 0755 php.ini-recommended $RPM_BUILD_ROOT/etc/php.ini
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Jan 20 2004 Marcus Boerger [EMAIL PROTECTED]
+- Fix script
+- Drop pdf
+- Drop hardcoded path to libs
+- Change ini path to /etc
+- Added man page
+- Added cli binary
+
 * Mon Mar 04 2002 Arjen Lentz [EMAIL PROTECTED]
 - Fix path and remove --with-imap due to conflicts with kerberos.
 
@@ -132,10 +143,11 @@
 - Made initial cut for PHP3.
 
 %files
+%defattr(-,root,root)
 /usr/lib/apache/libphp4.so
 /usr/bin/php
-%doc TODO CODING_STANDARDS CREDITS ChangeLog LICENSE BUGS examples
-%doc manual/*
+
+%doc TODO CODING_STANDARDS CREDITS ChangeLog LICENSE NEWS
 EOF
 
 RPMDIR=/usr/src/redhat/RPMS
@@ -144,13 +156,12 @@
 
 (
 make clean
-find . -name config.cache -exec rm -f '{}'
+find . -name config.cache -exec rm -f '{}' \;
 cd .. 
 tar czvf ${SRCDIR}/${TAR} $TARDIR )
 
 cp -a $SPEC $SPECDIR/${SPEC}
 #cp -a *.patch $SRCDIR
 cd $SRCDIR
-chown -R root.root ${TAR}
 cd $SPECDIR
 rpm -ba -v ${SPEC}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_3) / makerpm

2004-01-19 Thread Marcus Boerger 
helly   Mon Jan 19 14:58:57 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcmakerpm 
  Log:
  Correct license
  
http://cvs.php.net/diff.php/php-src/makerpm?r1=1.4r2=1.4.8.1ty=u
Index: php-src/makerpm
diff -u php-src/makerpm:1.4 php-src/makerpm:1.4.8.1
--- php-src/makerpm:1.4 Mon Mar  4 05:45:30 2002
+++ php-src/makerpm Mon Jan 19 14:58:57 2004
@@ -38,7 +38,7 @@
 Release: PRELEASE
 Group: Networking/Daemons
 Source0: http://www.php.net/distributions/php-%{PACKAGE_VERSION}.tar.gz
-Copyright: GPL
+Copyright: PHP License
 BuildRoot: /tmp/php4-root
 Requires: webserver
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php