[svn] r3101 - in trunk/rpms: . autossh bwm-ng cacti cacti-cactid colortail graveman imposter kismet lzo openvpn perl-Apache-ASP perl-Digest-HMAC rrdtool trac windowmaker

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Mon Apr 4 22:13:20 CEST 2005


Author: dag
Date: 2005-04-04 22:13:17 +0200 (Mon, 04 Apr 2005)
New Revision: 3101

Added:
   trunk/rpms/cacti-cactid/
   trunk/rpms/cacti-cactid/cacti-cactid.spec
Modified:
   trunk/rpms/autossh/autossh.spec
   trunk/rpms/bwm-ng/bwm-ng.spec
   trunk/rpms/cacti/cacti.spec
   trunk/rpms/colortail/colortail.spec
   trunk/rpms/graveman/graveman.spec
   trunk/rpms/imposter/imposter.spec
   trunk/rpms/kismet/kismet.spec
   trunk/rpms/lzo/lzo.spec
   trunk/rpms/openvpn/openvpn-2.0.spec
   trunk/rpms/perl-Apache-ASP/perl-Apache-ASP.spec
   trunk/rpms/perl-Digest-HMAC/perl-Digest-HMAC.spec
   trunk/rpms/rrdtool/rrdtool-1.0.48-php_config.patch
   trunk/rpms/rrdtool/rrdtool.spec
   trunk/rpms/trac/trac.spec
   trunk/rpms/windowmaker/windowmaker.spec
Log:
Updates

Modified: trunk/rpms/autossh/autossh.spec
===================================================================
--- trunk/rpms/autossh/autossh.spec	2005-04-04 19:32:33 UTC (rev 3100)
+++ trunk/rpms/autossh/autossh.spec	2005-04-04 20:13:17 UTC (rev 3101)
@@ -25,7 +25,7 @@
 such as connection refused.
 
 %prep
-%setup -n %{name}-%{version}
+%setup
 
 %{__perl} -pi.orig -e 's|-Wall |%{optflags} |g' Makefile.linux
 

Modified: trunk/rpms/bwm-ng/bwm-ng.spec
===================================================================
--- trunk/rpms/bwm-ng/bwm-ng.spec	2005-04-04 19:32:33 UTC (rev 3100)
+++ trunk/rpms/bwm-ng/bwm-ng.spec	2005-04-04 20:13:17 UTC (rev 3101)
@@ -10,7 +10,7 @@
 Group: Applications/Internet
 URL: http://www.gropp.org/
 
-Source: http://freshmeat.net/redir/bwm-ng/52961/url_tgz/bwm-ng-%{version}.tar.gz
+Source: http://www.gropp.org/bwm-ng/bwm-ng-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: ncurses-devel
@@ -47,14 +47,12 @@
 	--with-getifaddrs \
 	--with-sysctl \
 	--with-procnetdev \
-	--with-netstatlinux \
-	--with-strip
+	--with-netstatlinux
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
-#%{__make} install \
-#	DESTDIR="%{buildroot}"
+#%{__make} install DESTDIR="%{buildroot}"
 %{__install} -Dp -m0755 src/bwm-ng %{buildroot}%{_bindir}/bwm-ng
 %{__install} -Dp -m0644 bwm-ng.1 %{buildroot}%{_mandir}/man1/bwm-ng.1
 

Modified: trunk/rpms/cacti/cacti.spec
===================================================================
--- trunk/rpms/cacti/cacti.spec	2005-04-04 19:32:33 UTC (rev 3100)
+++ trunk/rpms/cacti/cacti.spec	2005-04-04 20:13:17 UTC (rev 3101)
@@ -7,25 +7,28 @@
 %{?el2:%define _without_net_snmp 1}
 %{?rh6:%define _without_net_snmp 1}
 
+%define logmsg logger -t %{name}/rpm
+
 Summary: Network monitoring/graphing tool
 Name: cacti
 Version: 0.8.6c
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/System
 URL: http://www.cacti.net/
 
 Source: http://www.cacti.net/downloads/cacti-%{version}.tar.gz
-#Source1: http://www.cacti.net/downloads/cacti-cactid-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires: mysql-devel, net-snmp-utils, openssl-devel
+BuildRequires: mysql-devel, openssl-devel
 
-%{!?_without_net_snmp:BuildRequires: net-snmp-devel}
-%{?_without_net_snmp:BuildRequires: ucd-snmp-devel}
+%{!?_without_net_snmp:BuildRequires: net-snmp-devel, net-snmp-utils}
+%{?_without_net_snmp:BuildRequires: ucd-snmp-devel, ucd-snmp-utils}
 
-Requires: webserver, mysql, net-snmp, rrdtool
-Requires: php, php-mysql, php-snmp, php-rrdtool
+Requires: webserver, mysql, rrdtool
+Requires: php, php-mysql, php-snmp
+%{!?_without_net_snmp:Requires: net-snmp}
+%{?_without_net_snmp:Requires: ucd-snmp}
 
 %description
 Cacti is a complete frontend to RRDTool. It stores all of the necessary 
@@ -37,15 +40,6 @@
 handles the data gathering. There is SNMP support for those used to
 creating traffic graphs with MRTG.
 
-%package cactid
-Summary: Fast c-based poller for package %{name}
-Group: Application/System
-Requires: %{name} = %{version}-%{release}
-
-%description cactid
-Cactid is a supplemental poller for Cacti that makes use of pthreads
-to achieve excellent performance.
-
 %package docs
 Summary: Documentation for package %{name}
 Group: Documentation
@@ -60,10 +54,8 @@
 %prep
 %setup
 
-%{__perl} -pi.orig -e 's|/lib([ /])|/%{_lib}$1|g' cactid/configure
+echo -e "*/5 * * * *\tcacti\tphp %{_localstatedir}/www/cacti/poller.php &>/dev/null" >cacti.crontab
 
-echo -e "*/5 * * * *\tcacti\tphp %{_localstatedir}/www/cacti/cmd.php &>/dev/null" >cacti.crontab
-
 ### Add a default cacti.conf for Apache.
 %{__cat} <<EOF >cacti.httpd
 Alias /cacti/ %{_localstatedir}/www/cacti/
@@ -81,9 +73,6 @@
 EOF
 
 %build
-#cd cactid
-#configure
-#%{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
@@ -91,16 +80,19 @@
 %{__install} -p -m0644 *.php cacti.sql %{buildroot}%{_localstatedir}/www/cacti/
 %{__cp} -apvx docs/ images/ include/ install/ lib/ log/ resource/ rra/ scripts/ %{buildroot}%{_localstatedir}/www/cacti/
 
-#%{__install} -Dp -m0755 cactid/cactid %{buildroot}%{_bindir}/cactid
-#%{__install} -Dp -m0644 cactid/cactid.conf %{buildroot}%{_sysconfdir}/cactid.conf
 %{__install} -Dp -m0644 cacti.crontab %{buildroot}%{_sysconfdir}/cron.d/cacti
 %{__install} -Dp -m0644 cacti.httpd %{buildroot}%{_sysconfdir}/httpd/conf.d/cacti.conf
 
 %pre
-useradd -d %{_localstatedir}/www/cacti cacti &>/dev/null || :
+if ! /usr/bin/id cacti &>/dev/null; then
+	/usr/sbin/useradd -r -d %{_localstatedir}/www/cacti -s /bin/sh -c "cacti" cacti || \
+		%logmsg "Unexpected error adding user \"cacti\". Aborting installation."
+fi
 
 %postun
-userdel cacti &>/dev/null || :
+if [ $1 -eq 0 ]; then
+	/usr/sbin/userdel cacti || %logmsg "User \"cacti\" could not be deleted."
+fi
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -108,10 +100,9 @@
 %files
 %defattr(-, root, root, 0755)
 %doc LICENSE README
-#%config(noreplace) %{_sysconfdir}/cactid.conf
 %config(noreplace) %{_localstatedir}/www/cacti/include/config.php
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/*
-%config %{_sysconfdir}/cron.d/*
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/cacti.conf
+%config %{_sysconfdir}/cron.d/cacti
 %dir %{_localstatedir}/www/cacti/
 %{_localstatedir}/www/cacti/*.php
 %{_localstatedir}/www/cacti/cacti.sql
@@ -122,22 +113,20 @@
 %{_localstatedir}/www/cacti/lib/
 %{_localstatedir}/www/cacti/resource/
 %{_localstatedir}/www/cacti/scripts/
-#%{_bindir}/*
+
 %defattr(-, cacti, cacti, 0755 )
 %{_localstatedir}/www/cacti/log/
 %{_localstatedir}/www/cacti/rra/
 
-#%files cactid
-#%defattr(-, root, root, 0755)
-#%doc cacti-cactid-%{version}/AUTHORS cacti-cactid-%{version}/CHANGELOG cacti-cactid-%{version}/COPYING cacti-cactid-%{version}/INSTALL cacti-cactid-%{version}/NEWS
-#%config %{_sysconfdir}/cactid.conf
-#%{_bindir}/*
-
 %files docs
 %defattr(-, root, root, 0755)
 %doc docs/
 
 %changelog
+* Mon Apr 04 2005 Dag Wieers <dag at wieers.com> - 0.8.6c-2
+- Fix for the crontab entry. (Gilles Chauvin, Joe Pruett)
+- Removed the php-rrdtool dependency. (Gilles Chauvin, Joe Pruett)
+
 * Fri Mar 18 2005 Dag Wieers <dag at wieers.com> - 0.8.6c-1
 - Updated to release 0.8.6c.
 

Added: trunk/rpms/cacti-cactid/cacti-cactid.spec
===================================================================
--- trunk/rpms/cacti-cactid/cacti-cactid.spec	2005-04-04 19:32:33 UTC (rev 3100)
+++ trunk/rpms/cacti-cactid/cacti-cactid.spec	2005-04-04 20:13:17 UTC (rev 3101)
@@ -0,0 +1,57 @@
+# $Id$
+# Authority: dag
+# Upstream: <cacti-user$lists,sf,net>
+
+%{?dist: %{expand: %%define %dist 1}}
+%{?rh7:%define _without_net_snmp 1}
+%{?el2:%define _without_net_snmp 1}
+%{?rh6:%define _without_net_snmp 1}
+
+Summary: Fast c-based poller for package cacti
+Name: cacti-cactid
+Version: 0.8.6d
+Release: 1
+License: GPL
+Group: Applications/System
+URL: http://www.cacti.net/
+
+Source: http://www.cacti.net/downloads/cactid/cacti-cactid-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: mysql-devel
+
+%{!?_without_net_snmp:BuildRequires: net-snmp-devel, net-snmp-utils}
+%{?_without_net_snmp:BuildRequires: ucd-snmp-devel, ucd-snmp-utils}
+
+Requires: cacti
+
+%description
+Cactid is a supplemental poller for Cacti that makes use of pthreads
+to achieve excellent performance.
+
+%prep
+%setup
+
+%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' configure
+
+%build
+%configure
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__install} -D -m0755 cactid %{buildroot}%{_bindir}/cactid
+%{__install} -D -m0644 cactid.conf %{buildroot}%{_sysconfdir}/cactid.conf
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc AUTHORS CHANGELOG COPYING INSTALL NEWS README
+%config(noreplace) %{_sysconfdir}/cactid.conf
+%{_bindir}/cactid
+
+%changelog
+* Mon Apr 04 2005 Dag Wieers <dag at wieers.com> - 0.8.6d-1
+- Initial package. (using DAR)


Property changes on: trunk/rpms/cacti-cactid/cacti-cactid.spec
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + native

Modified: trunk/rpms/colortail/colortail.spec
===================================================================
--- trunk/rpms/colortail/colortail.spec	2005-04-04 19:32:33 UTC (rev 3100)
+++ trunk/rpms/colortail/colortail.spec	2005-04-04 20:13:17 UTC (rev 3101)
@@ -4,19 +4,18 @@
 
 %{?dist: %{expand: %%define %dist 1}}
 
-Summary: log colorizer that makes log checking easier
+Summary: Log colorizer that makes log checking easier
 Name: colortail
 Version: 0.3.0
-Release: 0
+Release: 1
 Group: Applications/File
 License: GPL
 URL: http://www.student.hk-r.se/~pt98jan/colortail.html
 
-Source: http://www.student.hk-r.se/~pt98jan/%{name}-%{version}.tar.gz
+Source: http://www.student.hk-r.se/~pt98jan/colortail-%{version}.tar.gz
 Patch: colortail-0.3.0-gcc3.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-
 %description
 Colortail is a log colorizer that makes log checking easier. It works
 like tail but can read one or more configuration files. In which it's
@@ -39,9 +38,12 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{_bindir}/*
+%doc AUTHORS ChangeLog COPYING NEWS README TODO example-conf/conf.*
+%{_bindir}/colortail
 
 %changelog
-* Tue May 06 2003 Dag Wieers <dag at wieers.com> - 
+* Mon Apr 04 2005 Dag Wieers <dag at wieers.com> - 0.3.0-1
+- Added example config files. (Adrian Reber)
+
+* Tue May 06 2003 Dag Wieers <dag at wieers.com> - 0.3.0-0
 - Initial package. (using DAR)

Modified: trunk/rpms/graveman/graveman.spec
===================================================================
--- trunk/rpms/graveman/graveman.spec	2005-04-04 19:32:33 UTC (rev 3100)
+++ trunk/rpms/graveman/graveman.spec	2005-04-04 20:13:17 UTC (rev 3101)
@@ -5,7 +5,7 @@
 
 Summary: Graphical front-end for cdrtools
 Name: graveman
-Version: 0.3.9
+Version: 0.3.10
 Release: 1
 License: GPL
 Group: Applications/Multimedia
@@ -14,7 +14,7 @@
 Source: http://savannah.nongnu.org/download/graveman/graveman-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires: gtk2-devel >= 2.4
+BuildRequires: gtk2-devel >= 2.4, libglade2-devel >= 2.4
 BuildRequires: libid3tag-devel, libmad-devel, libogg-devel, libvorbis-devel
 Requires: cdrecord, mkisofs, sox
 
@@ -26,14 +26,16 @@
 %prep
 %setup
 
+%{__perl} -pi.orig -e 's|^(Applicationman)\s*=.*|$1 = \$(DESTDIR)\$(mandir)|' man/Makefile.in
+
 %build
 %configure
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install \
-	DESTDIR="%{buildroot}"
+%{__install} -d -m0755 %{buildroot}%{_mandir}{,/fr}/man1/
+%{__make} install DESTDIR="%{buildroot}"
 %find_lang %{name}
 
 desktop-file-install --delete-original             \
@@ -51,12 +53,17 @@
 %files -f %{name}.lang
 %defattr(-, root, root, 0755)
 %doc AUTHORS ChangeLog COPYING NEWS README
+%doc %{_mandir}/man1/*
+%doc %{_mandir}/fr/man1/*
 %{_bindir}/graveman
 %{_datadir}/applications/%{desktop_vendor}-graveman.desktop
 %{_datadir}/graveman/
 %{_datadir}/pixmaps/graveman48.png
 
 %changelog
+* Mon Apr 04 2005 Dag Wieers <dag at wieers.com> - 0.3.10-1
+- Updated to release 0.3.10.
+
 * Sat Apr 02 2005 Dag Wieers <dag at wieers.com> - 0.3.9-1
 - Updated to release 0.3.9.
 

Modified: trunk/rpms/imposter/imposter.spec
===================================================================
--- trunk/rpms/imposter/imposter.spec	2005-04-04 19:32:33 UTC (rev 3100)
+++ trunk/rpms/imposter/imposter.spec	2005-04-04 20:13:17 UTC (rev 3101)
@@ -6,7 +6,7 @@
 
 Summary: Standalone viewer for OpenOffice presentations
 Name: imposter
-Version: 0.2
+Version: 0.3
 Release: 1
 License: GPL
 Group: Applications/Productivity
@@ -71,5 +71,8 @@
 %{_datadir}/applications/%{desktop_vendor}-imposter.desktop
 
 %changelog
+* Mon Apr 04 2005 Dag Wieers <dag at wieers.com> - 0.3-1
+- Updated to release 0.3.
+
 * Sat Nov 20 2004 Dag Wieers <dag at wieers.com> - 0.2-1
 - Initial package. (using DAR)

Modified: trunk/rpms/kismet/kismet.spec
===================================================================
--- trunk/rpms/kismet/kismet.spec	2005-04-04 19:32:33 UTC (rev 3100)
+++ trunk/rpms/kismet/kismet.spec	2005-04-04 20:13:17 UTC (rev 3101)
@@ -7,7 +7,7 @@
 Summary: 802.11 (wireless) network sniffer and network dissector
 Name: kismet
 Version: 3.0.1
-Release: 2.200501r1
+Release: 2.200504r1
 License: GPL
 Group: Applications/Internet
 URL: http://www.kismetwireless.net/
@@ -62,8 +62,12 @@
 %{_datadir}/kismet/
 
 %changelog
+* Sun Apr 03 2005 Dag Wieers <dag at wieers.com> - 3.0.1-2.200504r1
+- Updated to release 2005-04-R1.
+
 * Thu Feb 24 2005 Dag Wieers <dag at wieers.com> - 3.0.1-2.200501r1
 - Revert config directory to /etc.
+- Updated to release 2005-01-R1.
 
 * Thu Dec 23 2004 Dag Wieers <dag at wieers.com> - 3.0.1-1.200410r1
 - Updated to release 2004-10-R1.

Modified: trunk/rpms/lzo/lzo.spec
===================================================================
--- trunk/rpms/lzo/lzo.spec	2005-04-04 19:32:33 UTC (rev 3100)
+++ trunk/rpms/lzo/lzo.spec	2005-04-04 20:13:17 UTC (rev 3101)
@@ -35,9 +35,9 @@
 %prep
 %setup
 %patch -p0 -b .asm
-%{__autoconf}
 
 %build
+#%{__autoconf}
 %configure \
     --enable-shared
 %{__make} %{?_smp_mflags}

Modified: trunk/rpms/openvpn/openvpn-2.0.spec
===================================================================
--- trunk/rpms/openvpn/openvpn-2.0.spec	2005-04-04 19:32:33 UTC (rev 3100)
+++ trunk/rpms/openvpn/openvpn-2.0.spec	2005-04-04 20:13:17 UTC (rev 3101)
@@ -4,12 +4,12 @@
 
 # Tag: test
 
-%define prever rc19
+%define prever rc20
 
 Summary: Robust and highly flexible VPN daemon
 Name: openvpn
 Version: 2.0
-Release: %{?prever:0.%{prever}.}2
+Release: %{?prever:0.%{prever}.}1
 License: GPL
 Group: Applications/Internet
 URL: http://openvpn.net/
@@ -45,6 +45,7 @@
 %{__make} %{?_smp_mflags} -C plugin/auth-pam
 %{__make} %{?_smp_mflags} -C plugin/down-root
 
+
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR="%{buildroot}"
@@ -95,6 +96,9 @@
 
 
 %changelog
+* Mon Apr 04 2005 Dag Wieers <dag at wieers.com> - 2.0-0.rc20.1
+- Updated to release 2.0_rc20.
+
 * Sat Apr 02 2005 Dag Wieers <dag at wieers.com> - 2.0-0.rc19.2
 - Disabled find-requires for %%doc.
 

Modified: trunk/rpms/perl-Apache-ASP/perl-Apache-ASP.spec
===================================================================
--- trunk/rpms/perl-Apache-ASP/perl-Apache-ASP.spec	2005-04-04 19:32:33 UTC (rev 3100)
+++ trunk/rpms/perl-Apache-ASP/perl-Apache-ASP.spec	2005-04-04 20:13:17 UTC (rev 3101)
@@ -54,7 +54,8 @@
 %files
 %defattr(-, root, root, 0755)
 %doc CHANGES LICENSE MANIFEST README
-%doc %{_mandir}/man?/*
+%doc %{_mandir}/man3/*
+%dir %{perl_vendorlib}/Apache/
 %{perl_vendorlib}/Apache/ASP/
 %{perl_vendorlib}/Apache/ASP.pm
 %dir %{perl_vendorlib}/Bundle/

Modified: trunk/rpms/perl-Digest-HMAC/perl-Digest-HMAC.spec
===================================================================
--- trunk/rpms/perl-Digest-HMAC/perl-Digest-HMAC.spec	2005-04-04 19:32:33 UTC (rev 3100)
+++ trunk/rpms/perl-Digest-HMAC/perl-Digest-HMAC.spec	2005-04-04 20:13:17 UTC (rev 3101)
@@ -5,6 +5,9 @@
 
 %{?dist: %{expand: %%define %dist 1}}
 
+%define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)
+%define perl_vendorarch %(eval "`perl -V:installvendorarch`"; echo $installvendorarch)
+
 %define real_name Digest-HMAC
 
 Name: perl-Digest-HMAC
@@ -15,7 +18,7 @@
 Group: Applications/CPAN
 URL: http://search.cpan.org/dist/Digest-HMAC/
 
-Source: %{real_name}-%{version}.tar.gz
+Source: http://www.cpan.org/modules/by-module/Digest/Digest-HMAC-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildArch: noarch
@@ -39,9 +42,7 @@
 %setup -n %{real_name}-%{version} 
 
 %build
-CFLAGS="%{optflags}" %{__perl} Makefile.PL \
-	PREFIX="%{buildroot}%{_prefix}" \
-	INSTALLDIRS="vendor"
+%{__perl} Makefile.PL PREFIX="%{buildroot}%{_prefix}" INSTALLDIRS="vendor"
 %{__make} %{?_smp_mflags}
 #{__make} %{?_smp_mflags} test
 
@@ -50,9 +51,7 @@
 %makeinstall
 
 ### Clean up buildroot
-%{__rm} -rf %{buildroot}%{_libdir}/perl5/*/*-linux-thread-multi/ \
-                %{buildroot}%{_libdir}/perl5/vendor_perl/*/*-linux-thread-multi/ \
-                %{buildroot}%{_libdir}/perl5/vendor_perl/*/*-linux/
+%{__rm} -rf %{buildroot}%{perl_archlib} %{buildroot}%{perl_vendorarch}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -60,8 +59,9 @@
 %files
 %defattr(-, root, root, 0755)
 %doc Changes README rfc2104.txt
-%doc %{_mandir}/man?/*
-%{_libdir}/perl5/vendor_perl/*/*
+%doc %{_mandir}/man3/*
+%dir %{perl_vendorlib}/Digest/
+%{perl_vendorlib}/Digest/HMAC.pm
 
 %changelog
 * Sun Jan 26 2003 Dag Wieers <dag at wieers.com>

Modified: trunk/rpms/rrdtool/rrdtool-1.0.48-php_config.patch
===================================================================
--- trunk/rpms/rrdtool/rrdtool-1.0.48-php_config.patch	2005-04-04 19:32:33 UTC (rev 3100)
+++ trunk/rpms/rrdtool/rrdtool-1.0.48-php_config.patch	2005-04-04 20:13:17 UTC (rev 3101)
@@ -1,10 +1,11 @@
 --- contrib/php4/php_rrdtool.h.orig	2003-06-30 10:46:50.000000000 +0200
 +++ contrib/php4/php_rrdtool.h	2004-08-25 20:15:28.172799056 +0200
-@@ -12,6 +12,8 @@
+@@ -12,6 +12,9 @@
  #ifndef _PHP4_RRDTOOL_H
  #define _PHP4_RRDTOOL_H
  
 +#include "php_config.h"
++#include "config.h"
 +
  #if COMPILE_DL_RRDTOOL
  #undef HAVE_RRDTOOL

Modified: trunk/rpms/rrdtool/rrdtool.spec
===================================================================
--- trunk/rpms/rrdtool/rrdtool.spec	2005-04-04 19:32:33 UTC (rev 3100)
+++ trunk/rpms/rrdtool/rrdtool.spec	2005-04-04 20:13:17 UTC (rev 3101)
@@ -7,7 +7,7 @@
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
 Version: 1.0.49
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Databases
 URL: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
@@ -157,6 +157,9 @@
 
 
 %changelog
+* Mon Apr 04 2005 Dag Wieers <dag at wieers.com> - 1.0.49-2
+- Fix for the php-rrdtool patch. (Joe Pruett)
+
 * Thu Aug 25 2004 Dag Wieers <dag at wieers.com> - 1.0.49-1
 - Updated to release 1.0.49.
 

Modified: trunk/rpms/trac/trac.spec
===================================================================
--- trunk/rpms/trac/trac.spec	2005-04-04 19:32:33 UTC (rev 3100)
+++ trunk/rpms/trac/trac.spec	2005-04-04 20:13:17 UTC (rev 3101)
@@ -62,6 +62,7 @@
 %{__python} setup.py install --root="%{buildroot}"
 
 %{__install} -Dp -m0644 trac.httpd %{buildroot}%{_sysconfdir}/httpd/conf.d/trac.conf
+%{__install} -d -m0755 %{buildroot}%{_localstatedir}/lib/trac/
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -74,6 +75,7 @@
 %{_bindir}/trac*
 %{_datadir}/trac/
 %{python_sitelib}/trac/
+%{_localstatedir}/lib/trac/
 
 %changelog
 * Fri Mar 04 2005 Dag Wieers <dag at wieers.com> - 0.8.1-1

Modified: trunk/rpms/windowmaker/windowmaker.spec
===================================================================
--- trunk/rpms/windowmaker/windowmaker.spec	2005-04-04 19:32:33 UTC (rev 3100)
+++ trunk/rpms/windowmaker/windowmaker.spec	2005-04-04 20:13:17 UTC (rev 3101)
@@ -80,8 +80,8 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall \
-	NLSDIR="%{buildroot}%{_datadir}/locale"
+%{__make} install \
+	DESTDIR="%{buildroot}"
 %find_lang %{real_name}
 %find_lang WPrefs
 %find_lang WINGs
@@ -96,7 +96,8 @@
 %files -f %{real_name}.lang
 %defattr(-, root, root, 0755)
 %doc AUTHORS BUGFORM BUGS ChangeLog COPYING* FAQ* NEWS README* TODO
-%doc %{_mandir}/man1/*.1*
+%doc %{_mandir}/man1/*.1x*
+%doc %{_mandir}/sk/man1/*.1x*
 %config %{_sysconfdir}/X11/gdm/Sessions/*
 %config %{_sysconfdir}/X11/dm/Sessions/windowmaker.desktop
 %config %{_sysconfdir}/WindowMaker/
@@ -109,6 +110,7 @@
 %files devel
 %defattr(-, root, root, 0755)
 %{_includedir}/*.h
+%{_includedir}/WINGs/
 %{_libdir}/lib*.a
 %exclude %{_libdir}/libwraster.la
 %{_libdir}/libwraster.so




More information about the commits mailing list