Patryk Szczygłowski wrote:
> - up to 2.5 RC2
> - PLD-patch updated
> - STBR
- up to 2.5 final
reszta bez zmian
--
Patryk Szczygłowski
[EMAIL PROTECTED]
JID: [EMAIL PROTECTED]
Index: phpSysInfo-PLD.patch
===================================================================
RCS file: /cvsroot/SOURCES/phpSysInfo-PLD.patch,v
retrieving revision 1.1
diff -u -r1.1 phpSysInfo-PLD.patch
--- phpSysInfo-PLD.patch 22 Jan 2005 15:37:13 -0000 1.1
+++ phpSysInfo-PLD.patch 5 Dec 2005 22:50:48 -0000
@@ -1,22 +1,10 @@
---- phpsysinfo/includes/os/class.Linux.inc.php.orig 2005-01-22
16:10:45.168602016 +0100
-+++ phpsysinfo/includes/os/class.Linux.inc.php 2005-01-22 16:07:15.758566823
+0100
-@@ -452,6 +452,10 @@
- $buf = fgets($fd, 1024);
- fclose($fd);
- $result = 'Debian ' . trim($buf);
-+ } elseif ($fd = fopen('/etc/pld-release', 'r')) {
-+ $buf = fgets($fd, 1024);
-+ fclose($fd);
-+ $result = trim($buf);
- } elseif ($fd = fopen('/etc/SuSE-release', 'r')) {
- $buf = fgets($fd, 1024);
- fclose($fd);
-@@ -497,6 +501,8 @@
- function distroicon () {
- if (file_exists('/etc/debian_version')) {
- $result = 'Debian.gif';
-+ } elseif (file_exists('/etc/pld-release')) {
-+ $result = 'PLD.gif';
- } elseif (file_exists('/etc/SuSE-release')) {
- $result = 'Suse.gif';
- } elseif (file_exists('/etc/mandrake-release')) {
+--- distros.ini.old 2005-11-22 15:30:28.000000000 +0100
++++ distros.ini 2005-12-05 23:35:57.000000000 +0100
+@@ -58,3 +58,7 @@
+
+ [Ubunto]
+ Files = "/etc/lsb-release"
++
++[PLD]
++Image = "PLD.gif"
++Files = "/etc/pld-release"
Index: phpSysInfo.spec
===================================================================
RCS file: /cvsroot/SPECS/phpSysInfo.spec,v
retrieving revision 1.16
diff -u -r1.16 phpSysInfo.spec
--- phpSysInfo.spec 19 Sep 2005 19:43:34 -0000 1.16
+++ phpSysInfo.spec 9 Dec 2005 03:23:34 -0000
@@ -2,14 +2,14 @@
Summary: phpSysInfo is a PHP script that displays information about the
host being accessed
Summary(pl): phpSysInfo jest skryptem PHP wy¶wietlaj±cym informacje o
wywo³anym hoscie
Name: phpSysInfo
-Version: 2.3
-Release: 2
+Version: 2.5
+Release: 1
License: GPL
# not sure about this Group:
Group: Networking/Utilities
Vendor: Uriah Welcome <[EMAIL PROTECTED]>
Source0:
http://dl.sourceforge.net/phpsysinfo/phpsysinfo-%{version}.tar.gz
-# Source0-md5: 8e9a2b7a099e26cbd85f140475512ccc
+# Source0-md5: 78ad80176b787754eb1019c7e8f38caa
Source1: %{name}.conf
Source2: %{name}-PLD.gif
Patch0: %{name}-PLD.patch
@@ -38,8 +38,8 @@
interfejsów sieciowych czy dysków.
%prep
-%setup -q -n phpsysinfo-dev
-%patch0 -p1
+%setup -q -n phpsysinfo
+%patch0 -p0
%install
rm -rf $RPM_BUILD_ROOT
@@ -47,8 +47,8 @@
$RPM_BUILD_ROOT%{_sysinfodir}/includes/{lang,mb,os,xml} \
$RPM_BUILD_ROOT{%{_sysconfdir},/etc/httpd}
-install config.php.new index.php phpsysinfo.dtd $RPM_BUILD_ROOT%{_sysinfodir}
-install images/*.gif %{SOURCE2} $RPM_BUILD_ROOT%{_sysinfodir}/images
+install index.php phpsysinfo.dtd distros.ini $RPM_BUILD_ROOT%{_sysinfodir}
+install images/*.gif images/*.png %{SOURCE2}
$RPM_BUILD_ROOT%{_sysinfodir}/images
install %{SOURCE2} $RPM_BUILD_ROOT%{_sysinfodir}/images/PLD.gif
install includes/*.php $RPM_BUILD_ROOT%{_sysinfodir}/includes
install includes/lang/*.php $RPM_BUILD_ROOT%{_sysinfodir}/includes/lang
@@ -105,6 +105,7 @@
%{_sysinfodir}/config.php
%{_sysinfodir}/index.php
%{_sysinfodir}/phpsysinfo.dtd
+%{_sysinfodir}/distros.ini
%{_sysinfodir}/images
%{_sysinfodir}/includes
%{_sysinfodir}/templates
_______________________________________________
pld-devel-pl mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
