rpms/bochs import.log,1.4,1.5
by fedora-extras-commits@redhat.com
Changeset from: scop
Update of /cvs/extras/rpms/bochs
In directory cvs.fedora.redhat.com:/tmp/cvs-serv16918
Modified Files:
import.log
Log Message:
auto-import bochs-2.1.1-0.fdr.1.2 on branch FC-2 from bochs-2.1.1-0.fdr.1.2.src.rpm
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/bochs/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log 8 Nov 2004 04:07:55 -0000 1.4
+++ import.log 5 Dec 2004 14:27:38 -0000 1.5
@@ -1,3 +1,4 @@
bochs-2_1-0_fdr_2_rh90:HEAD:bochs-2.1-0.fdr.2.rh90.src.rpm:1099886788
bochs-2_1-0_fdr_2_1:HEAD:bochs-2.1-0.fdr.2.1.src.rpm:1099886794
bochs-2_1-0_fdr_2_1_2:HEAD:bochs-2.1-0.fdr.2.1.2.src.rpm:1099886875
+bochs-2_1_1-0_fdr_1_2:FC-2:bochs-2.1.1-0.fdr.1.2.src.rpm:1102256646
17 years, 5 months
rpms/gweled/FC-2 gweled-Makefile.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gweled.spec, 1.3, 1.4 sources, 1.3, 1.4
by fedora-extras-commits@redhat.com
Changeset from: scop
Update of /cvs/extras/rpms/gweled/FC-2
In directory cvs.fedora.redhat.com:/tmp/cvs-serv16801/FC-2
Modified Files:
.cvsignore gweled.spec sources
Added Files:
gweled-Makefile.patch
Log Message:
auto-import gweled-0.6-0.fdr.1.2 on branch FC-2 from gweled-0.6-0.fdr.1.2.src.rpm
gweled-Makefile.patch:
--- NEW FILE gweled-Makefile.patch ---
--- Makefile.in.patch0 2004-11-30 21:26:41.000000000 +0100
+++ Makefile.in 2004-12-01 18:54:34.522949336 +0100
@@ -624,14 +624,14 @@
fi \
done \
fi
- -$(mkinstalldirs) $(scoredir)
- touch $(scoredir)/gweled.easy.scores
- -chown $(scores_user):$(scores_group) $(scoredir)/gweled.easy.scores
- -chmod 664 $(scoredir)/gweled.easy.scores
- touch $(scoredir)/gweled.timed.scores
- -chown $(scores_user):$(scores_group) $(scoredir)/gweled.timed.scores
- -chmod 664 $(scoredir)/gweled.timed.scores
- -if test "x$(setgid)" = "xtrue"; then chgrp $(scores_group) $(DESTDIR)$(bindir)/gweled && chmod 2555 $(DESTDIR)$(bindir)/gweled ; fi
+ -$(mkinstalldirs) $(DESTDIR)$(scoredir)
+ touch $(DESTDIR)$(scoredir)/gweled.easy.scores
+# -chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/gweled.easy.scores
+# -chmod 664 $(DESTDIR)$(scoredir)/gweled.easy.scores
+ touch $(DESTDIR)$(scoredir)/gweled.timed.scores
+# -chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/gweled.timed.scores
+# -chmod 664 $(DESTDIR)$(scoredir)/gweled.timed.scores
+# -if test "x$(setgid)" = "xtrue"; then chgrp $(scores_group) $(DESTDIR)$(bindir)/gweled && chmod 2555 $(DESTDIR)$(bindir)/gweled ; fi
dist-hook:
if test -d pixmaps; then \
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gweled/FC-2/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 8 Nov 2004 04:32:07 -0000 1.3
+++ .cvsignore 5 Dec 2004 14:21:06 -0000 1.4
@@ -1 +1 @@
-gweled-0.5.tar.gz
+gweled-0.6.tar.gz
Index: gweled.spec
===================================================================
RCS file: /cvs/extras/rpms/gweled/FC-2/gweled.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gweled.spec 8 Nov 2004 04:32:07 -0000 1.3
+++ gweled.spec 5 Dec 2004 14:21:06 -0000 1.4
@@ -1,5 +1,5 @@
Name: gweled
-Version: 0.5
+Version: 0.6
Release: 0.fdr.1.2
Epoch: 0
Summary: Swapping gem game.
@@ -8,6 +8,7 @@
License: GPL
URL: http://sebdelestaing.free.fr/gweled/
Source0: http://sebdelestaing.free.fr/gweled/Release/gweled-%{version}.tar.gz
+Patch0: %{name}-Makefile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libgnomeui-devel >= 0:2.0.0
@@ -24,6 +25,7 @@
%prep
%setup -q
+%patch0 -p0 -b .patch0
%build
%configure
@@ -43,7 +45,6 @@
${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
mkdir $RPM_BUILD_ROOT%{_localstatedir}/lib/
mv $RPM_BUILD_ROOT%{_localstatedir}/games/ $RPM_BUILD_ROOT%{_localstatedir}/lib/games/
-cp $RPM_BUILD_ROOT/var/lib/games/gweled.easy.scores $RPM_BUILD_ROOT/var/lib/games/gweled.timed.scores
%clean
@@ -55,15 +56,18 @@
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README
%attr(2551,root,games) %{_bindir}/gweled
-%attr(0664,games,games) %{_localstatedir}/lib/games/gweled.easy.scores
-%attr(0664,games,games) %{_localstatedir}/lib/games/gweled.timed.scores
+%config(noreplace) %attr(0664,games,games) %{_localstatedir}/lib/games/*
%{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/pixmaps
%{_datadir}/pixmaps/*
-%{_datadir}/gweled
-%{_datadir}/gweled/*
+%{_datadir}/gweled/
%changelog
+* Tue Aug 31 2004 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0:0.6-0.fdr.1
+- Update to 0.6
+- Remove highscore workaround
+- Add Makefile patch
+- Don't overwrite highscores during update
+
* Tue Aug 31 2004 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0:0.5-0.fdr.1
- Update to 0.5
- Add highscorce workaround
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gweled/FC-2/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 8 Nov 2004 04:32:07 -0000 1.3
+++ sources 5 Dec 2004 14:21:06 -0000 1.4
@@ -1 +1 @@
-238f5ef66317bb24c3d4018a7d1e9ec3 gweled-0.5.tar.gz
+40b4eaa8e1aca93cf6bc9d91a3c2c048 gweled-0.6.tar.gz
17 years, 5 months
rpms/gweled import.log,1.4,1.5
by fedora-extras-commits@redhat.com
Changeset from: scop
Update of /cvs/extras/rpms/gweled
In directory cvs.fedora.redhat.com:/tmp/cvs-serv16801
Modified Files:
import.log
Log Message:
auto-import gweled-0.6-0.fdr.1.2 on branch FC-2 from gweled-0.6-0.fdr.1.2.src.rpm
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gweled/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log 8 Nov 2004 04:32:07 -0000 1.4
+++ import.log 5 Dec 2004 14:21:06 -0000 1.5
@@ -1,3 +1,4 @@
gweled-0_4-0_fdr_2_1:HEAD:gweled-0.4-0.fdr.2.1.src.rpm:1099888318
gweled-0_4-0_fdr_2_2:HEAD:gweled-0.4-0.fdr.2.2.src.rpm:1099888324
gweled-0_5-0_fdr_1_2:HEAD:gweled-0.5-0.fdr.1.2.src.rpm:1099888327
+gweled-0_6-0_fdr_1_2:FC-2:gweled-0.6-0.fdr.1.2.src.rpm:1102256277
17 years, 5 months
rpms/hddtemp/devel hddtemp.init, 1.1, 1.2 hddtemp.spec, 1.5, 1.6 hddtemp.sysconfig, 1.1, 1.2 sources, 1.3, 1.4
by fedora-extras-commits@redhat.com
Changeset from: scop
Update of /cvs/extras/rpms/hddtemp/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv11770
Modified Files:
hddtemp.init hddtemp.spec hddtemp.sysconfig sources
Log Message:
Init script/ sysconfig cleanup, hddtemp.db 2004-11-30.
Index: hddtemp.init
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hddtemp.init 8 Nov 2004 04:33:28 -0000 1.1
+++ hddtemp.init 4 Dec 2004 22:43:31 -0000 1.2
@@ -21,14 +21,15 @@
# Backwards compatibility.
[ -z "$HDDTEMP_OPTIONS" -a -n "$HDDTEMPARGS" ] && \
HDDTEMP_OPTIONS="$HDDTEMPARGS"
+HDDTEMP_OPTIONS="$HDDTEMP_OPTIONS $HDDTEMP_DAEMON_OPTIONS"
exec="__SBINDIR__/hddtemp"
prog=$(basename $exec)
lockfile=__LOCKDIR__/subsys/$prog
start() {
- echo -n $"Starting $prog: "
- daemon $exec -d $HDDTEMP_OPTIONS $HDDTEMP_DAEMON_OPTIONS
+ echo -n $"Starting hard disk temperature monitor daemon ($prog): "
+ daemon $exec -d $HDDTEMP_OPTIONS
retval=$?
echo
[ $retval -eq 0 ] && touch $lockfile
@@ -36,7 +37,7 @@
}
stop() {
- echo -n $"Stopping $prog: "
+ echo -n $"Stopping hard disk temperature monitor daemon ($prog): "
killproc $prog
retval=$?
echo
@@ -49,33 +50,21 @@
start
}
-reload() {
- restart
-}
-
-force_reload() {
- restart
-}
-
-fdrstatus() {
- status $prog
-}
-
# See how we were called.
case "$1" in
- start|stop|restart|reload)
+ start|stop|restart)
$1
;;
- force-reload)
- force_reload
+ reload|force-reload)
+ restart
;;
status)
- fdrstatus
+ status $prog
;;
- condrestart)
+ try-restart|condrestart)
[ ! -f $lockfile ] || restart
;;
*)
- echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}"
+ echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
exit 2
esac
Index: hddtemp.spec
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hddtemp.spec 8 Nov 2004 04:34:04 -0000 1.5
+++ hddtemp.spec 4 Dec 2004 22:43:31 -0000 1.6
@@ -1,6 +1,6 @@
Name: hddtemp
Version: 0.3
-Release: 0.fdr.0.10.beta12.2
+Release: 0.1.beta12
Epoch: 0
Summary: Hard disk temperature tool
@@ -38,7 +38,8 @@
%build
-%configure --with-db-path=%{_datadir}/misc/hddtemp.db
+%configure --disable-dependency-tracking \
+ --with-db-path=%{_datadir}/misc/hddtemp.db
make %{?_smp_mflags}
@@ -63,7 +64,7 @@
%post
/sbin/chkconfig --add hddtemp
if [ $1 -gt 1 ]; then
- %{_initrddir}/hddtemp condrestart >/dev/null || :
+ %{_initrddir}/hddtemp try-restart >/dev/null || :
fi
%preun
@@ -91,6 +92,11 @@
%changelog
+* Sat Dec 4 2004 Ville Skytt�� <ville.skytta at iki.fi> - 0:0.3-0.1.beta12
+- Init script and sysconfig cleanups.
+- Build with dependency tracking disabled.
+- Update hddtemp.db to 2004-11-30.
+
* Sat Oct 2 2004 Ville Skytt�� <ville.skytta at iki.fi> 0:0.3-0.fdr.0.10.beta12
- Update to 0.3 beta 12 and the latest db.
Index: hddtemp.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hddtemp.sysconfig 8 Nov 2004 04:33:28 -0000 1.1
+++ hddtemp.sysconfig 4 Dec 2004 22:43:31 -0000 1.2
@@ -1,10 +1,4 @@
#
-# hddtemp options, for both command line and daemon use.
-# Put at least the disk(s) you want to monitor here.
+# hddtemp(8) daemon options. Add at least the disk(s) you want to monitor here.
#
-HDDTEMP_OPTIONS=""
-
-#
-# Options used only in daemon mode (when invoked by the init script).
-#
-HDDTEMP_DAEMON_OPTIONS="-l 127.0.0.1"
+HDDTEMP_OPTIONS="-l 127.0.0.1"
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 8 Nov 2004 04:34:04 -0000 1.3
+++ sources 4 Dec 2004 22:43:31 -0000 1.4
@@ -1,2 +1,2 @@
51f19658fa6e745eee62f6e100838884 hddtemp-0.3-beta12.tar.bz2
-4cd1caa5573efae5eedd36ee91b41b2c hddtemp.db
+0a5add4df5f20d8a7471bd48e6842762 hddtemp.db
17 years, 5 months
rpms/inkscape/devel .cvsignore, 1.3, 1.4 inkscape.spec, 1.3, 1.4 sources, 1.3, 1.4
by fedora-extras-commits@redhat.com
Changeset from: pcompton
Update of /cvs/extras/rpms/inkscape/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv11609
Modified Files:
.cvsignore inkscape.spec sources
Log Message:
inkscape 0.40
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/inkscape/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 8 Nov 2004 04:36:07 -0000 1.3
+++ .cvsignore 4 Dec 2004 21:35:57 -0000 1.4
@@ -1 +1 @@
-inkscape-0.39.tar.bz2
+inkscape-0.40.tar.bz2
Index: inkscape.spec
===================================================================
RCS file: /cvs/extras/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- inkscape.spec 12 Nov 2004 05:34:53 -0000 1.3
+++ inkscape.spec 4 Dec 2004 21:35:57 -0000 1.4
@@ -1,23 +1,24 @@
Name: inkscape
-Version: 0.39
-Release: 0.fdr.2
+Version: 0.40
+Release: 1
Summary: A vector-based drawing program using SVG.
Group: Applications/Productivity
License: GPL
URL: http://inkscape.sourceforge.net/
-Source0: http://dl.sf.net/sourceforge/inkscape/inkscape-0.39.tar.bz2
+Source0: http://download.sourceforge.net/inkscape/inkscape-0.40.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: atk-devel
BuildRequires: desktop-file-utils
BuildRequires: freetype-devel
+BuildRequires: gc-devel
BuildRequires: gettext
-BuildRequires: gtk2-devel
+BuildRequires: gtkmm24-devel
BuildRequires: libart_lgpl-devel >= 2.3.10
BuildRequires: libgnomeprintui22-devel >= 2.2.0
BuildRequires: libpng-devel
-BuildRequires: libsigc++-devel >= 1.2.5
+BuildRequires: libsigc++20-devel
BuildRequires: libxml2-devel >= 2.4.24
BuildRequires: pango-devel
BuildRequires: perl-XML-Parser
@@ -47,7 +48,6 @@
%setup -q
%build
-sed -i "s/%%U/%%F/g;" inkscape.desktop.in
%configure \
--disable-dependency-tracking \
%ifarch i386
@@ -71,7 +71,7 @@
rm -rf ${RPM_BUILD_ROOT}
make install DESTDIR=${RPM_BUILD_ROOT}
%find_lang %{name}
-
+find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
desktop-file-install --vendor fedora --delete-original \
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
@@ -99,12 +99,18 @@
%{_datadir}/%{name}
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/*
+%{_libdir}/inkscape/
%changelog
+* Sat Dec 04 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.40-1
+- 0.40.
+
+* Mon Nov 16 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.40-0.pre3
+- 0.40pre3.
+
* Thu Nov 11 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.39-0.fdr.2
- post/postun for new mime system.
-- Fix for desktop entry.
- Dropped redundant BR XFree86-devel.
* Sun Aug 29 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.39-0.fdr.1
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/inkscape/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 8 Nov 2004 04:36:07 -0000 1.3
+++ sources 4 Dec 2004 21:35:57 -0000 1.4
@@ -1 +1 @@
-3542a646c6742686557b2f0e52c5f6dc inkscape-0.39.tar.bz2
+5f53659eb47efce8593e39d30ebb1c77 inkscape-0.40.tar.bz2
17 years, 5 months
rpms/diradmin/devel .cvsignore, 1.2, 1.3 diradmin.spec, 1.2, 1.3 sources, 1.2, 1.3
by fedora-extras-commits@redhat.com
Changeset from: scop
Update of /cvs/extras/rpms/diradmin/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv11380
Modified Files:
.cvsignore diradmin.spec sources
Log Message:
Fix build, merge changes from my version of the package.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/diradmin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 04:14:02 -0000 1.2
+++ .cvsignore 4 Dec 2004 18:53:46 -0000 1.3
@@ -1 +1,2 @@
directory_administrator-1.5.1.tar.gz
+directory-administrator_1.5.1.0-5.diff.gz
Index: diradmin.spec
===================================================================
RCS file: /cvs/extras/rpms/diradmin/devel/diradmin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- diradmin.spec 11 Nov 2004 19:21:36 -0000 1.2
+++ diradmin.spec 4 Dec 2004 18:53:46 -0000 1.3
@@ -1,14 +1,16 @@
Summary: User control management tool for LDAP directories
Name: diradmin
Version: 1.5.1
-Release: 4
+Release: 5
License: GPL
Group: Applications/System
URL: http://diradmin.open-it.org/
Source: http://diradmin.open-it.org/directory_administrator-%{version}.tar.gz
+Patch: http://ftp.debian.org/debian/pool/main/d/directory-administrator/director...
BuildRoot: %{_tmppath}/%{name}-%{release}-%{version}-root
BuildRequires: gnome-libs-devel, openldap-devel, desktop-file-utils
-Obsoletes: directory_administrator <= 1.3.5
+BuildRequires: openssl-devel
+Obsoletes: directory_administrator <= 1.5.1-4
%description
Directory administrator is a smart LDAP directory management tool. It can be
@@ -20,11 +22,17 @@
%prep
-%setup -n directory_administrator-%{version}
+%setup -q -n directory_administrator-%{version}
+%patch -p1
+%{__patch} -p1 < debian/patches/01_modifymail.dpatch
+%{__patch} -p1 < debian/patches/02_englishmessages.dpatch
+%{__patch} -p1 < debian/patches/03_bindaftersetoption.dpatch
+%{__patch} -p1 < debian/patches/04_protectpassword.dpatch
+%{__patch} -p1 < debian/patches/05_gstrconcatnull.dpatch
%build
-%configure
+%configure --disable-dependency-tracking
%{__make} %{?_smp_mflags}
@@ -32,17 +40,20 @@
%{__rm} -rf %{buildroot}
%makeinstall
-
# Replace desktop file, removing the categories
%{__rm} -f %{buildroot}%{_datadir}/applications/*
%{__cat} applnk/dragonfear-directory_administrator.desktop \
- | grep -v ^Categories > %{name}.desktop
+ | grep -v ^Categories | grep -v '^$' > %{name}.desktop
%{__mkdir_p} %{buildroot}%{_datadir}/applications
desktop-file-install --vendor fedora \
--dir %{buildroot}%{_datadir}/applications \
- --add-category Application \
+ --add-category X-Fedora \
+ --add-category GNOME \
--add-category System \
+ --add-category Application \
%{name}.desktop
+%{__install} -Dpm 644 debian/directory_administrator.1 \
+ %{buildroot}%{_mandir}/man1/directory_administrator.1
%clean
@@ -51,13 +62,21 @@
%files
%defattr(-, root, root, 0755)
-%doc AUTHORS NEWS COPYING ChangeLog TODO README doc/
+%doc AUTHORS COPYING CREDITS ChangeLog TODO README doc/
%{_bindir}/directory_administrator
-%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
+%{_datadir}/applications/*%{name}.desktop
%{_datadir}/pixmaps/directory_administrator
+%{_mandir}/man1/directory_administrator.1*
%changelog
+* Sat Dec 4 2004 Ville Skytt�� <ville.skytta at iki.fi> - 1.5.1-5
+- Fix build, %%{desktop_vendor} doesn't exist any more.
+- Bump versioned obsoletes to provide even better Extras upgrade path.
+- BuildRequire openssl-devel to get SSL support built.
+- Merge other misc changes from my version of the same package, which owes
+ quite a bit to Debian.
+
* Wed Nov 10 2004 Matthias Saou <http://freshrpms.net/> 1.5.1-4
- Bump release to provide Extras upgrade path.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/diradmin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 04:14:02 -0000 1.2
+++ sources 4 Dec 2004 18:53:46 -0000 1.3
@@ -1 +1,2 @@
6ce1d8f2715ed100ec297779e7557d46 directory_administrator-1.5.1.tar.gz
+a627102d486ffd43280d414bfdab3bbc directory-administrator_1.5.1.0-5.diff.gz
17 years, 5 months
rpms/audacity/devel audacity.spec,1.4,1.5 sources,1.3,1.4
by fedora-extras-commits@redhat.com
Changeset from: mschwendt
Update of /cvs/extras/rpms/audacity/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv11112
Modified Files:
audacity.spec sources
Log Message:
Sync with audacity-1.2.3-0.fdr.1.2.src.rpm from Gerard
Index: audacity.spec
===================================================================
RCS file: /cvs/extras/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- audacity.spec 25 Nov 2004 00:01:49 -0000 1.4
+++ audacity.spec 4 Dec 2004 16:24:36 -0000 1.5
@@ -1,5 +1,5 @@
Name: audacity
-Version: 1.2.2
+Version: 1.2.3
Release: 1
Epoch: 0
Summary: A multitrack audio editor
@@ -7,7 +7,7 @@
Group: Applications/Multimedia
License: GPL
URL: http://audacity.sourceforge.net
-Source: http://aleron.dl.sourceforge.net/sourceforge/audacity/audacity-src-1.2.2....
+Source: http://dl.sf.net/sourceforge/audacity/audacity-src-1.2.3.tar.gz
Source1: audacity.png
Patch1: audacity-1.2.2-aboutdialog.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -18,6 +18,14 @@
%{?_with_mp3:BuildRequires: libmad-devel}
%{?_with_gtk2:BuildRequires: wxGTK2-devel}
%{!?_with_gtk2:BuildRequires: wxGTK-devel}
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
+
+# Compile options:
+# --with mp3 : enable mp3 support
+# --with gtk2 : use gtk2 version of wxGTK
+# --with portaudiov19 : enable version 19 of portaudio (disables portmixer)
+
%description
Audacity is a cross-platform multitrack audio editor. It allows you to
@@ -38,7 +46,7 @@
done
%build
-%configure --with-help --with-libsndfile=system --with-libsamplerate=system --with-libflac=system --with-ladspa --with-id3tag=system %{?_with_mp3:--with-libmad=system}
+%configure --with-help --with-libsndfile=system --with-libsamplerate=system --with-libflac=system --with-ladspa --with-vorbis=system --with-id3tag=system %{?_with_mp3:--with-libmad=system} %{?_with_portaudiov19:--with-portaudio=v19 --without-portmixer}
make
%install
@@ -49,14 +57,16 @@
cat > audacity.desktop <<EOF
[Desktop Entry]
+Name=Audacity
+GenericName=Sound editor
Type=Application
Exec=audacity
-Name=Audacity
Icon=audacity.png
Terminal=false
Comment=A multitrack audio editor
Encoding=UTF-8
-X-Desktop-File-Install-Version=0.3
+X-Desktop-File-Install-Version=0.4
+MimeType=audio/*;application/ogg;
StartupWMClass=Audacity
EOF
@@ -73,6 +83,12 @@
%clean
rm -rf ${RPM_BUILD_ROOT}
+%post
+/usr/bin/update-desktop-database /usr/share/applications > /dev/null 2>&1 || :
+
+%postun
+/usr/bin/update-desktop-database /usr/share/applications > /dev/null 2>&1 || :
+
%files -f %{name}.lang
%defattr(-,root,root,-)
%{_bindir}/*
@@ -83,7 +99,10 @@
%doc %{_datadir}/doc/*
%changelog
-* Sat Oct 30 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:1.2.2-1
+* Sat Nov 20 2004 Gerard Milmeister <gemi(a)bluewin.ch> - 0:1.2.3-1
+- New Version 1.2.3
+
+* Sat Oct 30 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:1.2.2-0.fdr.1
- Update to 1.2.2, patch aboutdialog to be readable with wxGTK.
* Mon May 10 2004 Gerard Milmeister <gemi(a)bluewin.ch> - 0:1.2.1-0.fdr.1
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audacity/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 25 Nov 2004 00:01:49 -0000 1.3
+++ sources 4 Dec 2004 16:24:36 -0000 1.4
@@ -1 +1 @@
-68d60659ad936792f6d7d746a40a7179 audacity-src-1.2.2.tar.gz
+dbfc1b401420aa694753d35acb5a8a28 audacity-src-1.2.3.tar.gz
17 years, 5 months
rpms/audacity/FC-2 .cvsignore, 1.2, 1.3 audacity.spec, 1.4, 1.5 sources, 1.3, 1.4
by fedora-extras-commits@redhat.com
Changeset from: mschwendt
Update of /cvs/extras/rpms/audacity/FC-2
In directory cvs.fedora.redhat.com:/tmp/cvs-serv11022/FC-2
Modified Files:
.cvsignore audacity.spec sources
Log Message:
auto-import audacity-1.2.3-0.fdr.1.2 on branch FC-2 from audacity-1.2.3-0.fdr.1.2.src.rpm
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-2/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 04:04:07 -0000 1.2
+++ .cvsignore 4 Dec 2004 16:23:04 -0000 1.3
@@ -1 +1 @@
-audacity-src-1.2.1.tar.bz2
+audacity-src-1.2.3.tar.gz
Index: audacity.spec
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-2/audacity.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- audacity.spec 25 Nov 2004 00:01:49 -0000 1.4
+++ audacity.spec 4 Dec 2004 16:23:04 -0000 1.5
@@ -1,5 +1,5 @@
Name: audacity
-Version: 1.2.2
+Version: 1.2.3
Release: 0.fdr.1.2
Epoch: 0
Summary: A multitrack audio editor
@@ -7,7 +7,7 @@
Group: Applications/Multimedia
License: GPL
URL: http://audacity.sourceforge.net
-Source: http://aleron.dl.sourceforge.net/sourceforge/audacity/audacity-src-1.2.2....
+Source: http://dl.sf.net/sourceforge/audacity/audacity-src-1.2.3.tar.gz
Source1: audacity.png
Patch1: audacity-1.2.2-aboutdialog.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -18,6 +18,14 @@
%{?_with_mp3:BuildRequires: libmad-devel}
%{?_with_gtk2:BuildRequires: wxGTK2-devel}
%{!?_with_gtk2:BuildRequires: wxGTK-devel}
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
+
+# Compile options:
+# --with mp3 : enable mp3 support
+# --with gtk2 : use gtk2 version of wxGTK
+# --with portaudiov19 : enable version 19 of portaudio (disables portmixer)
+
%description
Audacity is a cross-platform multitrack audio editor. It allows you to
@@ -38,7 +46,7 @@
done
%build
-%configure --with-help --with-libsndfile=system --with-libsamplerate=system --with-libflac=system --with-ladspa --with-id3tag=system %{?_with_mp3:--with-libmad=system}
+%configure --with-help --with-libsndfile=system --with-libsamplerate=system --with-libflac=system --with-ladspa --with-vorbis=system --with-id3tag=system %{?_with_mp3:--with-libmad=system} %{?_with_portaudiov19:--with-portaudio=v19 --without-portmixer}
make
%install
@@ -49,14 +57,16 @@
cat > audacity.desktop <<EOF
[Desktop Entry]
+Name=Audacity
+GenericName=Sound editor
Type=Application
Exec=audacity
-Name=Audacity
Icon=audacity.png
Terminal=false
Comment=A multitrack audio editor
Encoding=UTF-8
-X-Desktop-File-Install-Version=0.3
+X-Desktop-File-Install-Version=0.4
+MimeType=audio/*;application/ogg;
StartupWMClass=Audacity
EOF
@@ -73,6 +83,12 @@
%clean
rm -rf ${RPM_BUILD_ROOT}
+%post
+/usr/bin/update-desktop-database /usr/share/applications > /dev/null 2>&1 || :
+
+%postun
+/usr/bin/update-desktop-database /usr/share/applications > /dev/null 2>&1 || :
+
%files -f %{name}.lang
%defattr(-,root,root,-)
%{_bindir}/*
@@ -83,6 +99,9 @@
%doc %{_datadir}/doc/*
%changelog
+* Sat Nov 20 2004 Gerard Milmeister <gemi(a)bluewin.ch> - 0:1.2.3-0.fdr.1
+- New Version 1.2.3
+
* Sat Oct 30 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:1.2.2-0.fdr.1
- Update to 1.2.2, patch aboutdialog to be readable with wxGTK.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-2/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 25 Nov 2004 00:01:49 -0000 1.3
+++ sources 4 Dec 2004 16:23:04 -0000 1.4
@@ -1 +1 @@
-68d60659ad936792f6d7d746a40a7179 audacity-src-1.2.2.tar.gz
+dbfc1b401420aa694753d35acb5a8a28 audacity-src-1.2.3.tar.gz
17 years, 5 months
rpms/audacity import.log,1.6,1.7
by fedora-extras-commits@redhat.com
Changeset from: mschwendt
Update of /cvs/extras/rpms/audacity
In directory cvs.fedora.redhat.com:/tmp/cvs-serv11022
Modified Files:
import.log
Log Message:
auto-import audacity-1.2.3-0.fdr.1.2 on branch FC-2 from audacity-1.2.3-0.fdr.1.2.src.rpm
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/audacity/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log 4 Dec 2004 16:22:13 -0000 1.6
+++ import.log 4 Dec 2004 16:23:04 -0000 1.7
@@ -3,3 +3,4 @@
audacity-1_2_1-0_fdr_1_2:HEAD:audacity-1.2.1-0.fdr.1.2.src.rpm:1099886662
audacity-1_2_3-0_fdr_1_1:FC-1:audacity-1.2.3-0.fdr.1.1.i386.rpm:1102176735
audacity-1_2_3-0_fdr_1_1:FC-1:audacity-1.2.3-0.fdr.1.1.src.rpm:1102177218
+audacity-1_2_3-0_fdr_1_2:FC-2:audacity-1.2.3-0.fdr.1.2.src.rpm:1102177269
17 years, 5 months
rpms/audacity/FC-1 audacity-1.2.2-aboutdialog.patch, 1.2, 1.3 audacity.png, 1.2, 1.3 audacity.spec, 1.4, 1.5 .cvsignore, 1.3, 1.4 sources, 1.4, 1.5
by fedora-extras-commits@redhat.com
Changeset from: mschwendt
Update of /cvs/extras/rpms/audacity/FC-1
In directory cvs.fedora.redhat.com:/tmp/cvs-serv10903/FC-1
Modified Files:
.cvsignore sources
Added Files:
audacity-1.2.2-aboutdialog.patch audacity.png audacity.spec
Log Message:
auto-import audacity-1.2.3-0.fdr.1.1 on branch FC-1 from audacity-1.2.3-0.fdr.1.1.src.rpm
audacity-1.2.2-aboutdialog.patch:
Index: audacity-1.2.2-aboutdialog.patch
===================================================================
RCS file: audacity-1.2.2-aboutdialog.patch
diff -N audacity-1.2.2-aboutdialog.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ audacity-1.2.2-aboutdialog.patch 4 Dec 2004 16:22:13 -0000 1.3
@@ -0,0 +1,15 @@
+diff -Nur audacity-src-1.2.2-orig/src/AboutDialog.cpp audacity-src-1.2.2/src/AboutDialog.cpp
+--- audacity-src-1.2.2-orig/src/AboutDialog.cpp 2004-08-26 05:27:33.000000000 +0200
++++ audacity-src-1.2.2/src/AboutDialog.cpp 2004-05-03 19:14:36.000000000 +0200
+@@ -129,11 +125,9 @@
+ translatorCredits += _("translator_credits");
+ translatorCredits += "</center>";
+ }
+- wxString localeStr = wxLocale::GetSystemEncodingName();
+
+ wxString creditStr =
+ "<html>"
+- "<head><META http-equiv=\"Content-Type\" content=\"text/html; charset=" + localeStr + "\"></head>"
+ "<body bgcolor=\"#ffffff\">"
+ "<font size=1>"
+ "<center>"
Index: audacity.spec
===================================================================
RCS file: audacity.spec
diff -N audacity.spec
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ audacity.spec 4 Dec 2004 16:22:13 -0000 1.5
@@ -0,0 +1,129 @@
+Name: audacity
+Version: 1.2.3
+Release: 0.fdr.1.1
+Epoch: 0
+Summary: A multitrack audio editor
+
+Group: Applications/Multimedia
+License: GPL
+URL: http://audacity.sourceforge.net
+Source: http://dl.sf.net/sourceforge/audacity/audacity-src-1.2.3.tar.gz
+Source1: audacity.png
+Patch1: audacity-1.2.2-aboutdialog.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: libogg-devel, libvorbis-devel, zlib-devel, perl
+BuildRequires: gettext, zip, flac-devel, ladspa-devel
+BuildRequires: libsamplerate-devel, libsndfile-devel
+BuildRequires: libid3tag-devel, desktop-file-utils
+%{?_with_mp3:BuildRequires: libmad-devel}
+%{?_with_gtk2:BuildRequires: wxGTK2-devel}
+%{!?_with_gtk2:BuildRequires: wxGTK-devel}
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
+
+# Compile options:
+# --with mp3 : enable mp3 support
+# --with gtk2 : use gtk2 version of wxGTK
+# --with portaudiov19 : enable version 19 of portaudio (disables portmixer)
+
+
+%description
+Audacity is a cross-platform multitrack audio editor. It allows you to
+record sounds directly or to import Ogg, WAV, AIFF, AU, IRCAM, or MP3
+files. It features a few simple effects, all of the editing features
+you should need, and unlimited undo. The GUI was built with wxWindows
+and the audio I/O currently uses OSS under Linux. Audacity runs on
+Linux/*BSD, MacOS, and Windows.
+
+%prep
+%setup -q -n %{name}-src-%{version}
+%patch1 -p1 -b .aboutdialog
+cp -a src/Languages.cpp src/Languages.cpp.orig
+iconv -f ISO_8859-1 -t UTF-8 src/Languages.cpp.orig > src/Languages.cpp
+for i in help/wxhelp/audacity.hhk help/wxhelp/exportmp3.htm locale/*.po src/export/ExportMP3.cpp
+do
+ perl -pi -e 's|libmp3lame.so|libmp3lame.so.0|g' $i
+done
+
+%build
+%configure --with-help --with-libsndfile=system --with-libsamplerate=system --with-libflac=system --with-ladspa --with-vorbis=system --with-id3tag=system %{?_with_mp3:--with-libmad=system} %{?_with_portaudiov19:--with-portaudio=v19 --without-portmixer}
+make
+
+%install
+rm -rf ${RPM_BUILD_ROOT}
+make DESTDIR=${RPM_BUILD_ROOT} install
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps
+
+cat > audacity.desktop <<EOF
+[Desktop Entry]
+Name=Audacity
+GenericName=Sound editor
+Type=Application
+Exec=audacity
+Icon=audacity.png
+Terminal=false
+Comment=A multitrack audio editor
+Encoding=UTF-8
+X-Desktop-File-Install-Version=0.4
+MimeType=audio/*;application/ogg;
+StartupWMClass=Audacity
+EOF
+
+desktop-file-install --vendor fedora \
+ --add-category X-Fedora \
+ --add-category Application \
+ --add-category GNOME \
+ --add-category AudioVideo \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ audacity.desktop
+
+%{find_lang} %{name}
+
+%clean
+rm -rf ${RPM_BUILD_ROOT}
+
+%post
+/usr/bin/update-desktop-database /usr/share/applications > /dev/null 2>&1 || :
+
+%postun
+/usr/bin/update-desktop-database /usr/share/applications > /dev/null 2>&1 || :
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%{_bindir}/*
+%{_datadir}/audacity
+%{_mandir}/*/*
+%{_datadir}/applications/*
+%{_datadir}/pixmaps/*
+%doc %{_datadir}/doc/*
+
+%changelog
+* Sat Nov 20 2004 Gerard Milmeister <gemi(a)bluewin.ch> - 0:1.2.3-0.fdr.1
+- New Version 1.2.3
+
+* Sat Oct 30 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:1.2.2-0.fdr.1
+- Update to 1.2.2, patch aboutdialog to be readable with wxGTK.
+
+* Mon May 10 2004 Gerard Milmeister <gemi(a)bluewin.ch> - 0:1.2.1-0.fdr.1
+- New Version 1.2.1
+
+* Sun Apr 11 2004 Gerard Milmeister <gemi(a)bluewin.ch> - 0:1.2.0-0.fdr.2
+- Fix for Language.cpp restored
+
+* Tue Mar 2 2004 Gerard Milmeister <gemi(a)bluewin.ch> - 0:1.2.0-0.fdr.1
+- New Version 1.2.0
+
+* Mon Nov 24 2003 Gerard Milmeister <gemi(a)bluewin.ch> - 0:1.2.0-0.fdr.4.pre3
+- Added icon
+- Separated mp3 plugin
+
+* Sun Nov 23 2003 Gerard Milmeister <gemi(a)bluewin.ch> - 0:1.2.0-0.fdr.2.pre3
+- Changes to specfile
+
+* Sun Nov 2 2003 Gerard Milmeister <gemi(a)bluewin.ch> - 0:1.2.0-0.fdr.1.pre3
+- New upstream version 1.2.0-pre3
+
+* Sat Oct 25 2003 Gerard Milmeister <gemi(a)bluewin.ch> - 0:1.2.0-pre2.fdr.1
+- First Fedora release
+
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-1/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 4 Dec 2004 16:14:08 -0000 1.3
+++ .cvsignore 4 Dec 2004 16:22:13 -0000 1.4
@@ -1,58 +1 @@
-audacity
-fedora-audacity.desktop
-audacity
-audacity-1.2-help.htb
-nyquist
-bug.lsp
-dspprims.lsp
-evalenv.lsp
-follow.lsp
-init.lsp
-misc.lsp
-nyinit.lsp
-nyqmisc.lsp
-nyquist.lsp
-printrec.lsp
-profile.lsp
-seq.lsp
-seqfnint.lsp
-seqmidi.lsp
-sndfnint.lsp
-system.lsp
-test.lsp
-xlinit.lsp
-plug-ins
-clicktrack.ny
-crossfadein.ny
-crossfadeout.ny
-delay.ny
-highpass.ny
-lowpass.ny
-pluck.ny
-tremolo.ny
-audacity
-LICENSE.txt
-README.txt
-audacity.mo
-audacity.mo
-audacity.mo
-audacity.mo
-audacity.mo
-audacity.mo
-audacity.mo
-audacity.mo
-audacity.mo
-audacity.mo
-audacity.mo
-audacity.mo
-audacity.mo
-audacity.mo
-audacity.mo
-audacity.mo
-audacity.mo
-audacity.mo
-audacity.mo
-audacity.mo
-audacity.mo
-audacity.1.gz
-audacity.png
+audacity-src-1.2.3.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-1/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 4 Dec 2004 16:14:08 -0000 1.4
+++ sources 4 Dec 2004 16:22:13 -0000 1.5
@@ -1,58 +1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+dbfc1b401420aa694753d35acb5a8a28 audacity-src-1.2.3.tar.gz
17 years, 5 months