rpms/php-pecl-pdo/FC-4 php-pecl-pdo.spec,1.1,1.2
by fedora-extras-commits@redhat.com
Author: thias
Update of /cvs/extras/rpms/php-pecl-pdo/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28863/FC-4
Modified Files:
php-pecl-pdo.spec
Log Message:
Fix problems found by Ignacio during his reviewing.
Index: php-pecl-pdo.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-pdo/FC-4/php-pecl-pdo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pecl-pdo.spec 31 May 2005 14:23:24 -0000 1.1
+++ php-pecl-pdo.spec 2 Jun 2005 12:11:04 -0000 1.2
@@ -3,7 +3,7 @@
Summary: PECL package for PHP Data Objects Interface
Name: php-pecl-pdo
Version: 0.3
-Release: 1
+Release: 2%{?dist}
License: PHP
Group: Development/Languages
URL: http://pecl.php.net/package/PDO
@@ -38,11 +38,13 @@
%prep
-phpize
%setup -n PDO-%{version}
+# Many files are +x without no obvious real reason
+%{__chmod} -x *
%build
+phpize
%configure
%{__make} %{?_smp_mflags}
@@ -73,7 +75,13 @@
%defattr(-, root, root, 0755)
%{_includedir}/php/ext/pdo/
+
%changelog
+* Thu Jun 2 2005 Matthias Saou <http://freshrpms.net/> 0.3-2
+- Move phpize from setup to build. Silly copy/paste error.
+- Remove execution bit from all files in the source tree.
+- Add %%{?dist} tag to make it easier to keep FC-4 and FC-5 branches in sync.
+
* Tue May 3 2005 Matthias Saou <http://freshrpms.net/> 0.3-1
- Initial RPM release.
18 years, 11 months
rpms/bittorrent/devel bttrack.init, 1.1, 1.2 btseed.init, 1.1, 1.2 bittorrent.spec, 1.15, 1.16
by fedora-extras-commits@redhat.com
Author: pghmcfc
Update of /cvs/extras/rpms/bittorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27935
Modified Files:
bttrack.init btseed.init bittorrent.spec
Log Message:
* Thu Jun 2 2005 Paul Howarth <paul(a)city-fan.org> 4.1.1-2
- tidy up description text
- improved initscripts (#158273)
- for versions on Fedora Core >= 4 or RHEL, put server data under /srv rather
than %{_localstatedir}
- separate logs/logrotate scripts for tracker and seeder
- have the gui subpackage obsolete the official BitTorrent RPM package, which
is called BitTorrent, includes the GUI in the same package and is built
using python's dist tools and hence doesn't include all dependencies,
provide initscripts etc.; this provides a clean upgrade path to Extras
Index: bttrack.init
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/bttrack.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bttrack.init 22 May 2005 22:55:32 -0000 1.1
+++ bttrack.init 2 Jun 2005 11:57:13 -0000 1.2
@@ -13,13 +13,13 @@
[ "${NETWORKING}" = "no" ] && exit 0
-#default
+# defaults
PORT=6969
-STATEFILE=/var/lib/bittorrent/bttrack
+STATEFILE=/srv/bittorrent/state/bttrack
OPTIONS=
LOGFILE=/var/log/bittorrent/bttrack.log
-# directly of torrents that the tracker is allowed to serve
-DIR="/var/spool/bittorrent"
+# directory of torrents that the tracker is allowed to serve
+DIR="/srv/bittorrent/data"
# source the config
. /etc/sysconfig/bttrack
@@ -32,10 +32,11 @@
case "$1" in
start)
echo -n $"Starting BitTorrent tracker: "
- daemon --user $btuser $prog --port $PORT --dfile $STATEFILE \
- --logfile $LOGFILE $OPTIONS --allowed_dir $DIR &
+ # still sub-optimal startup: does not detach properly from terminal
+ (runuser -s /bin/sh -c "$prog --port $PORT --dfile $STATEFILE --logfile $LOGFILE \
+ $OPTIONS --allowed_dir $DIR" $btuser &) && echo_success || echo_failure
RETVAL=$?
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bttrack
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bttrack.py
echo
;;
stop)
@@ -43,7 +44,7 @@
killproc $prog
#killproc "/usr/bin/python $prog"
RETVAL=$?
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bttrack
+ [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bttrack.py
echo
;;
restart|reload)
@@ -52,14 +53,14 @@
RETVAL=$?
;;
condrestart)
- if [ -f /var/lock/subsys/bttrack ]; then
+ if [ -f /var/lock/subsys/bttrack.py ]; then
$0 stop
$0 start
fi
RETVAL=$?
;;
status)
- status bttrack
+ status bttrack.py
RETVAL=$?
;;
*)
Index: btseed.init
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/btseed.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- btseed.init 22 May 2005 22:55:32 -0000 1.1
+++ btseed.init 2 Jun 2005 11:57:13 -0000 1.2
@@ -16,7 +16,10 @@
[ "${NETWORKING}" = "no" ] && exit 0
# default directory for torrents to seed
-DIR=/var/spool/bittorrent
+DIR=/srv/bittorrent/data
+
+# default log file
+SEEDLOG=/var/log/btseed.log
# source the config
. /etc/sysconfig/btseed
@@ -28,9 +31,11 @@
case "$1" in
start)
echo -n $"Starting BitTorrent seed client: "
- daemon --user $btuser $prog $OPTIONS $DIR &
+ # still sub-optimal startup: does not detach properly from terminal
+ (runuser -s /bin/sh -c "$prog $OPTIONS $DIR" $btuser > $SEEDLOG 2>&1 &) &&
+ echo_success || echo_failure
RETVAL=$?
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/btseed
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/btlaunchmany.py
echo
;;
stop)
@@ -38,7 +43,7 @@
killproc $prog
#killproc "/usr/bin/python $prog"
RETVAL=$?
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/btseed
+ [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/btlaunchmany.py
echo
;;
restart|reload)
@@ -47,14 +52,14 @@
RETVAL=$?
;;
condrestart)
- if [ -f /var/lock/subsys/btseed ]; then
+ if [ -f /var/lock/subsys/btlaunchmany.py ]; then
$0 stop
$0 start
fi
RETVAL=$?
;;
status)
- status btseed
+ status btlaunchmany.py
RETVAL=$?
;;
*)
Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- bittorrent.spec 31 May 2005 19:07:14 -0000 1.15
+++ bittorrent.spec 2 Jun 2005 11:57:13 -0000 1.16
@@ -4,7 +4,7 @@
Name: bittorrent
Version: 4.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: BitTorrent swarming network file transfer tool
Group: Applications/Internet
@@ -32,11 +32,11 @@
Requires(postun): /sbin/service
%description
-BitTorrent is a tool for copying files from one machine to
-another. FTP punishes sites for being popular: Since all uploading is
-done from one place, a popular site needs big iron and big
-bandwidth. With BitTorrent, clients automatically mirror files they
-download, making the publisher's burden almost nothing.
+BitTorrent is a tool for copying files from one machine to another. FTP
+punishes sites for being popular: Since all uploading is done from one place,
+a popular site needs big iron and big bandwidth. With BitTorrent, clients
+automatically mirror files they download, making the publisher's burden almost
+nothing.
%package gui
Summary: GUI versions of the BitTorrent file transfer tool
@@ -45,29 +45,52 @@
Requires: %{name} = %{version}-%{release}
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
+Obsoletes: BitTorrent <= %{version}
+Provides: BitTorrent
%description gui
This package contains the GUI versions of the BitTorrent file transfer
tool.
+# Fedora >= 4 has /srv, as does RHEL4
+# Older versions of RHEL don't provide other dependencies needed for this package, so don't cater for them
+%if "%{fedora}" >= "4" || 0%{?rhel}
+%define bt_dir /srv/bittorrent/data
+%define bt_statedir /srv/bittorrent/state
+%else
+%define bt_dir %{_localstatedir}/spool/bittorrent
+%define bt_statedir %{_localstatedir}/lib/bittorrent
+%endif
+
%prep
%setup -q -n BitTorrent-%{version}
%{__sed} -i "s/appdir = .*/appdir = '%{name}-%{version}'/" BitTorrent/__init__.py
%{__cat} <<EOF >btseed.sysconfig
-#DIR=%{_localstatedir}/spool/bittorrent
-OPTIONS="--max_upload_rate 350"
+DIR=%{bt_dir}
+OPTIONS="--max_upload_rate 350 --display_interval 300"
+SEEDLOG=%{_localstatedir}/log/bittorrent/btseed.log
EOF
%{__cat} <<EOF >bttrack.sysconfig
-#PORT=6969
-#DIR=%{_localstatedir}/spool/bittorrent
-#STATEFILE=%{_localstatedir}/lib/bittorrent/bttrack
-#LOGFILE=%{_localstatedir}/log/bittorrent/bttrack.log
-OPTIONS="--show_names 1 --hupmonitor 1"
+PORT=6969
+DIR=%{bt_dir}
+STATEFILE=%{bt_statedir}/bttrack
+LOGFILE=%{_localstatedir}/log/bittorrent/bttrack.log
+OPTIONS="--min_time_between_log_flushes 4.0 --show_names 1 --hupmonitor 1"
EOF
-%{__cat} <<EOF >torrent.logrotate
+%{__cat} <<EOF >btseed.logrotate
+%{_localstatedir}/log/bittorrent/btseed.log {
+ notifempty
+ missingok
+ postrotate
+ /sbin/service btseed condrestart 2>/dev/null >/dev/null || true
+ endscript
+}
+EOF
+
+%{__cat} <<EOF >bttrack.logrotate
%{_localstatedir}/log/bittorrent/bttrack.log {
notifempty
missingok
@@ -89,13 +112,16 @@
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category X-Fedora \
%{SOURCE1}
-%{__install} -d $RPM_BUILD_ROOT%{_localstatedir}/{spool,lib,log}/bittorrent
+%{__install} -d $RPM_BUILD_ROOT%{bt_dir}
+%{__install} -d $RPM_BUILD_ROOT%{bt_statedir}
+%{__install} -d $RPM_BUILD_ROOT%{_localstatedir}/log/bittorrent
%{__install} -m 0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/bittorrent.png
%{__install} -m 0755 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/btseed
%{__install} -m 0755 -D %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/bttrack
%{__install} -m 0644 -D btseed.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/btseed
%{__install} -m 0644 -D bttrack.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/bttrack
-%{__install} -m 0644 -D torrent.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/bittorrent
+%{__install} -m 0644 -D btseed.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/btseed
+%{__install} -m 0644 -D bttrack.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/bttrack
%{find_lang} bittorrent
%clean
@@ -152,12 +178,13 @@
%{python_sitelib}/khashmir/*.py
%{python_sitelib}/khashmir/*.pyc
%ghost %{python_sitelib}/khashmir/*.pyo
-%attr(-,torrent,torrent) %dir %{_localstatedir}/spool/bittorrent
-%attr(-,torrent,torrent) %dir %{_localstatedir}/lib/bittorrent
+%attr(-,torrent,torrent) %dir %{bt_dir}
+%attr(-,torrent,torrent) %dir %{bt_statedir}
%attr(-,torrent,torrent) %dir %{_localstatedir}/log/bittorrent
%{_sysconfdir}/rc.d/init.d/btseed
%{_sysconfdir}/rc.d/init.d/bttrack
-%config(noreplace) %{_sysconfdir}/logrotate.d/bittorrent
+%config(noreplace) %{_sysconfdir}/logrotate.d/btseed
+%config(noreplace) %{_sysconfdir}/logrotate.d/bttrack
%config(noreplace) %{_sysconfdir}/sysconfig/btseed
%config(noreplace) %{_sysconfdir}/sysconfig/bttrack
@@ -170,6 +197,17 @@
%{_datadir}/pixmaps/bittorrent.png
%changelog
+* Thu Jun 2 2005 Paul Howarth <paul(a)city-fan.org> 4.1.1-2%{?dist}
+- tidy up description text
+- improved initscripts (#158273)
+- for versions on Fedora Core >= 4 or RHEL, put server data under /srv rather
+ than %{_localstatedir}
+- separate logs/logrotate scripts for tracker and seeder
+- have the gui subpackage obsolete the official BitTorrent RPM package, which
+ is called BitTorrent, includes the GUI in the same package and is built
+ using python's dist tools and hence doesn't include all dependencies,
+ provide initscripts etc.; this provides a clean upgrade path to Extras
+
* Tue May 31 2005 Paul Howarth <paul(a)city-fan.org> 4.1.1-1%{?dist}
- update to 4.1.1
- add "khashmir" python library
18 years, 11 months
common tobuild,1.1052,1.1053
by fedora-extras-commits@redhat.com
Author: kaboom
Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27892
Modified Files:
tobuild
Log Message:
request build of rpms/fping/FC-4 fping-2_4b2-4_fc4 for fc4
Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1052
retrieving revision 1.1053
diff -u -r1.1052 -r1.1053
--- tobuild 2 Jun 2005 11:48:52 -0000 1.1052
+++ tobuild 2 Jun 2005 11:50:58 -0000 1.1053
@@ -36,3 +36,4 @@
mschwendt rpms/amarok/FC-4 amarok-1_2_4-3_fc4 fc4
kaboom devel/xdaliclock xdaliclock-2_20-2_fc5 devel
kaboom devel/qgo qgo-1_0_1-5_fc5 devel
+kaboom rpms/fping/FC-4 fping-2_4b2-4_fc4 fc4
18 years, 11 months
devel/common tobuild,1.1051,1.1052
by fedora-extras-commits@redhat.com
Author: kaboom
Update of /cvs/extras/devel/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27836
Modified Files:
tobuild
Log Message:
request build of devel/qgo qgo-1_0_1-5_fc5 for devel
Index: tobuild
===================================================================
RCS file: /cvs/extras/devel/common/tobuild,v
retrieving revision 1.1051
retrieving revision 1.1052
diff -u -r1.1051 -r1.1052
--- tobuild 2 Jun 2005 11:47:34 -0000 1.1051
+++ tobuild 2 Jun 2005 11:48:52 -0000 1.1052
@@ -35,3 +35,4 @@
ertzing rpms/enemies-of-carlotta/FC-4 enemies-of-carlotta-1_0_3-3_fc4 fc4
mschwendt rpms/amarok/FC-4 amarok-1_2_4-3_fc4 fc4
kaboom devel/xdaliclock xdaliclock-2_20-2_fc5 devel
+kaboom devel/qgo qgo-1_0_1-5_fc5 devel
18 years, 11 months
devel/common tobuild,1.1050,1.1051
by fedora-extras-commits@redhat.com
Author: kaboom
Update of /cvs/extras/devel/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27779
Modified Files:
tobuild
Log Message:
request build of devel/xdaliclock xdaliclock-2_20-2_fc5 for devel
Index: tobuild
===================================================================
RCS file: /cvs/extras/devel/common/tobuild,v
retrieving revision 1.1050
retrieving revision 1.1051
diff -u -r1.1050 -r1.1051
--- tobuild 2 Jun 2005 10:57:22 -0000 1.1050
+++ tobuild 2 Jun 2005 11:47:34 -0000 1.1051
@@ -34,3 +34,4 @@
mschwendt rpms/amarok/FC-4 amarok-1_2_4-2_fc4 fc4
ertzing rpms/enemies-of-carlotta/FC-4 enemies-of-carlotta-1_0_3-3_fc4 fc4
mschwendt rpms/amarok/FC-4 amarok-1_2_4-3_fc4 fc4
+kaboom devel/xdaliclock xdaliclock-2_20-2_fc5 devel
18 years, 11 months
common tobuild,1.1049,1.1050
by fedora-extras-commits@redhat.com
Author: mschwendt
Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26682
Modified Files:
tobuild
Log Message:
request build of rpms/amarok/FC-4 amarok-1_2_4-3_fc4 for fc4
Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1049
retrieving revision 1.1050
diff -u -r1.1049 -r1.1050
--- tobuild 2 Jun 2005 07:10:21 -0000 1.1049
+++ tobuild 2 Jun 2005 10:57:22 -0000 1.1050
@@ -33,3 +33,4 @@
spot rpms/mfstools/FC-4 mfstools-2_0-7_snapshot050221_fc4 fc4
mschwendt rpms/amarok/FC-4 amarok-1_2_4-2_fc4 fc4
ertzing rpms/enemies-of-carlotta/FC-4 enemies-of-carlotta-1_0_3-3_fc4 fc4
+mschwendt rpms/amarok/FC-4 amarok-1_2_4-3_fc4 fc4
18 years, 11 months
rpms/amarok/FC-4 amarok.spec,1.16,1.17
by fedora-extras-commits@redhat.com
Author: mschwendt
Update of /cvs/extras/rpms/amarok/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26604
Modified Files:
amarok.spec
Log Message:
* Thu Jun 2 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.4-3.fc4
- try to fix build problems (#158654): always set QTDIR, always
buildrequire libtool-ltdl-devel, disable %fedora conditionals
Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/amarok.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- amarok.spec 1 Jun 2005 23:31:42 -0000 1.16
+++ amarok.spec 2 Jun 2005 10:56:45 -0000 1.17
@@ -7,7 +7,7 @@
Name: amarok
Summary: Media player for KDE
Version: 1.2.4
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: Applications/Multimedia
License: GPL
@@ -24,11 +24,11 @@
BuildRequires: gstreamer-plugins-devel >= 0.8.4
BuildRequires: libmusicbrainz-devel, xmms-devel >= 1:1.2
BuildRequires: libvisual-devel >= 0.2.0, SDL-devel, gtk+-devel
-%if "%fedora" >= "4"
+#%if "%fedora" >= "4"
BuildRequires: libtool-ltdl-devel
-%else
-BuildRequires: libtool
-%endif
+#%else
+#BuildRequires: libtool
+#%endif
%if 0%{?use_xine}
BuildRequires: xine-lib-devel >= 0:1.0.0
@@ -67,7 +67,7 @@
enables it.
-%if "%fedora" >= "4"
+#%if "%fedora" >= "4"
%package akode
Summary: AKode engine for Amarok
Group: Applications/Multimedia
@@ -76,7 +76,7 @@
%description akode
Amarok can also use the akode engine to decode sound. This package
enables it.
-%endif
+#%endif
%if 0%{?use_xine}
%package xine
@@ -98,7 +98,8 @@
%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
+echo "fedora = %fedora"
+unset QTDIR && . /etc/profile.d/qt.sh
%configure \
--disable-debug \
%if %{?use_xine:0}%{!?use_xine:1}
@@ -204,6 +205,10 @@
%changelog
+* Thu Jun 2 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.4-3.fc4
+- try to fix build problems (#158654): always set QTDIR, always
+ buildrequire libtool-ltdl-devel, disable %%fedora conditionals
+
* Thu Jun 2 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.4-2.fc4
- temporarily add patch to work around Fedora Core bug 159090
18 years, 11 months
APPROVED: mlmmj
by Michael Fleming
Name: mlmmj
Summary: Mailserver-independent ezmlm-like mailing list manager
mlmmj (Mailing List Managing Made Joyful) is a mailing list manager
intended to mimic the functionality of the ezmlm-idx mailing list
manager often used with Prof. Dan Bernstein's qmail, but with an open
license and mailserver indepdendence.
Reviewer: Chris Ricker
Maintainer: Michael Fleming
Cheers,
Michael.
18 years, 11 months
common tobuild,1.1048,1.1049
by fedora-extras-commits@redhat.com
Author: ertzing
Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22419
Modified Files:
tobuild
Log Message:
request build of rpms/enemies-of-carlotta/FC-4 enemies-of-carlotta-1_0_3-3_fc4 for fc4
Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1048
retrieving revision 1.1049
diff -u -r1.1048 -r1.1049
--- tobuild 1 Jun 2005 23:39:58 -0000 1.1048
+++ tobuild 2 Jun 2005 07:10:21 -0000 1.1049
@@ -32,3 +32,4 @@
mschwendt rpms/gwenview/FC-4 gwenview-1_2_0-4_fc4 fc4
spot rpms/mfstools/FC-4 mfstools-2_0-7_snapshot050221_fc4 fc4
mschwendt rpms/amarok/FC-4 amarok-1_2_4-2_fc4 fc4
+ertzing rpms/enemies-of-carlotta/FC-4 enemies-of-carlotta-1_0_3-3_fc4 fc4
18 years, 11 months
rpms/ghc/devel .cvsignore, 1.3, 1.4 Makefile, 1.2, 1.3 ghc.spec, 1.5, 1.6 sources, 1.3, 1.4 ghc-bootstrap.spec, 1.1, NONE ghc-doc-no-ps-install.patch, 1.1, NONE
by fedora-extras-commits@redhat.com
Author: petersen
Update of /cvs/extras/rpms/ghc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16563
Modified Files:
.cvsignore Makefile ghc.spec sources
Removed Files:
ghc-bootstrap.spec ghc-doc-no-ps-install.patch
Log Message:
revert to non-bootstrap build
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 31 May 2005 11:04:47 -0000 1.3
+++ .cvsignore 2 Jun 2005 01:55:58 -0000 1.4
@@ -1,4 +1 @@
ghc-6.4-src.tar.bz2
-ghc-6.4-i386-unknown-linux.tar.bz2
-ghc-6.4-x86_64-unknown-linux.tar.bz2
-ghc-6.4-ppc-unknown-linux.tar.bz2
Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 31 May 2005 11:04:47 -0000 1.2
+++ Makefile 2 Jun 2005 01:55:58 -0000 1.3
@@ -1,9 +1,7 @@
# Makefile for source rpm: ghc
# $Id$
NAME := ghc
-#SPECFILE = $(firstword $(wildcard *.spec))
-# for bootstrap
-SPECFILE = ghc-bootstrap.spec
+SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ghc.spec 31 May 2005 11:04:47 -0000 1.5
+++ ghc.spec 2 Jun 2005 01:55:58 -0000 1.6
@@ -10,7 +10,7 @@
Name: ghc
Version: 6.4
-Release: 8%{dist}
+Release: 8%{?dist}
Summary: Glasgow Haskell Compilation system
License: BSD style
Group: Development/Languages
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 31 May 2005 11:04:47 -0000 1.3
+++ sources 2 Jun 2005 01:55:58 -0000 1.4
@@ -1,4 +1 @@
45ea4e15f135698feb88d12c5000aaf8 ghc-6.4-src.tar.bz2
-89aaed2c09667f25a1777012a42200c7 ghc-6.4-i386-unknown-linux.tar.bz2
-6ad2f7df7f55e8cfec0504384bf664ea ghc-6.4-x86_64-unknown-linux.tar.bz2
-1400a1c158b07821f81ee5e4a7433b91 ghc-6.4-ppc-unknown-linux.tar.bz2
--- ghc-bootstrap.spec DELETED ---
--- ghc-doc-no-ps-install.patch DELETED ---
18 years, 11 months