rpms/amule/devel .cvsignore, 1.2, 1.3 amule.spec, 1.3, 1.4 sources, 1.2, 1.3
by Aurélien Bompard
Author: abompard
Update of /cvs/free/rpms/amule/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25690/devel
Modified Files:
.cvsignore amule.spec sources
Log Message:
* Tue Aug 26 2008 Aurelien Bompard <abompard(a)fedoraproject.org> 2.2.2-1
- version 2.2.2
- patch 0 and 2 applied upstream
- drop patch1
- split off non-X-dependent tools
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/amule/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 3 Aug 2008 14:00:51 -0000 1.2
+++ .cvsignore 8 Nov 2008 09:14:43 -0000 1.3
@@ -1 +1 @@
-aMule-2.1.3.tar.bz2
+aMule-2.2.2.tar.bz2
Index: amule.spec
===================================================================
RCS file: /cvs/free/rpms/amule/devel/amule.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- amule.spec 26 Oct 2008 14:05:48 -0000 1.3
+++ amule.spec 8 Nov 2008 09:14:43 -0000 1.4
@@ -1,22 +1,23 @@
+# TODO: setup firefox for ed2k links using triggers and a file in /usr/lib/firefox-3.0.1/defaults/preferences/
+
Name: amule
-Version: 2.1.3
-Release: 5%{?dist}
+Version: 2.2.2
+Release: 1%{?dist}
Summary: File sharing client compatible with eDonkey
License: GPLv2+
Group: Applications/Internet
Source0: http://dl.sourceforge.net/%{name}/aMule-%{version}.tar.bz2
-Patch0: aMule-wx-1.2.patch
-Patch1: aMule-2.1.3-ocreate.patch
-Patch2: aMule-2.1.3-multiple.patch
Patch3: aMule-2.1.3-gcc43.patch
URL: http://amule.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# See http://www.amule.org/wiki/index.php/Requirements
-BuildRequires: wxGTK-devel >= 0:2.6.2, desktop-file-utils, expat-devel
+BuildRequires: wxGTK-devel >= 0:2.8.7, desktop-file-utils, expat-devel
BuildRequires: gd-devel >= 2.0.0, libpng-devel
BuildRequires: gettext-devel, flex, bison
-BuildRequires: readline-devel
+BuildRequires: readline-devel, cryptopp-devel, libupnp-devel
+BuildRequires: GeoIP-devel
Requires(pre): chkconfig
+Requires: %{name}-nogui
%description
aMule is an easy to use multi-platform client for ED2K Peer-to-Peer
@@ -24,6 +25,15 @@
Windows. aMule currently supports (but is not limited to) the
following platforms: Linux, *BSD and MacOS X.
+%package nogui
+Summary: aMule components which don't require a GUI (for servers)
+Group: Applications/Internet
+
+%description nogui
+This package containes the aMule components which don't require a GUI.
+It is useful for servers which don't have Xorg.
+
+
%package -n xchat-%{name}
Summary: Plugin to display aMule's statistics in XChat
Group: Applications/Internet
@@ -36,9 +46,6 @@
%prep
%setup -q -n aMule-%{version}
-%patch0 -p1 -b .wx28
-%patch1 -p1 -b .ocreate
-%patch2 -p1 -b .multiple
%patch3 -p1 -b .gcc43
@@ -54,11 +61,13 @@
--enable-amulecmd \
--enable-webserver \
--enable-amule-daemon \
- --enable-utf8-systray
+ --enable-utf8-systray \
+ --enable-geoip \
+ --enable-ccache \
+ --enable-optimize
# --enable-amule-gui compile aMule remote GUI (EXPERIMENTAL)
-
make %{?_smp_mflags}
@@ -102,20 +111,58 @@
%files -f %{name}.lang
%defattr(-,root,root)
%doc %{_datadir}/doc/aMule-%{version}
-%{_bindir}/*
+%{_bindir}/alc
+%{_bindir}/amule
+%{_bindir}/cas
+%{_bindir}/wxcas
%{_datadir}/%{name}/
%{_datadir}/cas
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/*
-%{_mandir}/man1/*.gz
-%{_mandir}/*/man1/*.gz
+%{_mandir}/man1/alc.1.gz
+%{_mandir}/*/man1/alc.1.gz
+%{_mandir}/man1/amule.1.gz
+%{_mandir}/*/man1/amule.1.gz
+%{_mandir}/man1/cas.1.gz
+%{_mandir}/*/man1/cas.1.gz
+%{_mandir}/man1/wxcas.1.gz
+%{_mandir}/*/man1/wxcas.1.gz
+%exclude %{_datadir}/%{name}/webserver
+
+%files nogui
+%{_bindir}/alcc
+%{_bindir}/amulecmd
+%{_bindir}/amuled
+%{_bindir}/amuleweb
+%{_bindir}/ed2k
+%{_datadir}/%{name}/webserver
+%{_mandir}/man1/alcc.1.gz
+%{_mandir}/*/man1/alcc.1.gz
+%{_mandir}/man1/amulecmd.1.gz
+%{_mandir}/*/man1/amulecmd.1.gz
+%{_mandir}/man1/amuled.1.gz
+%{_mandir}/*/man1/amuled.1.gz
+%{_mandir}/man1/amuleweb.1.gz
+%{_mandir}/*/man1/amuleweb.1.gz
+%{_mandir}/man1/ed2k.1.gz
+%{_mandir}/*/man1/ed2k.1.gz
+
%files -n xchat-%{name}
%defattr(-,root,root)
+%{_bindir}/autostart-xas
%{_libdir}/xchat/plugins/xas.pl
+%{_mandir}/man1/xas.1.gz
+%{_mandir}/*/man1/xas.1.gz
%changelog
+* Tue Aug 26 2008 Aurelien Bompard <abompard(a)fedoraproject.org> 2.2.2-1
+- version 2.2.2
+- patch 0 and 2 applied upstream
+- drop patch1
+- split off non-X-dependent tools
+
* Sun Oct 26 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.1.3-5
- rebuilt
Index: sources
===================================================================
RCS file: /cvs/free/rpms/amule/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 3 Aug 2008 14:00:51 -0000 1.2
+++ sources 8 Nov 2008 09:14:43 -0000 1.3
@@ -1 +1 @@
-0aafdd159edb8ad5f0064da87998b47d aMule-2.1.3.tar.bz2
+4bbb5fef3b7acd206c08beddb7fdbb42 aMule-2.2.2.tar.bz2
16 years, 1 month
rpms/broadcom-wl/F-8 README.txt, NONE, 1.1 broadcom-wl-blacklist, NONE, 1.1 broadcom-wl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Chris Nolan
Author: cnolan
Update of /cvs/nonfree/rpms/broadcom-wl/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22473/F-8
Modified Files:
.cvsignore sources
Added Files:
README.txt broadcom-wl-blacklist broadcom-wl.spec
Log Message:
Initial import
--- NEW FILE README.txt ---
-------
GENERAL
-------
This is an OFFICAL-RELEASE of Broadcom's IEEE 802.11a/b/g/n hybrid Linux device
driver for use with Broadcom's BCM4311-, BCM4312-, BCM4321-, and BCM4322-based
hardware.
This driver also supports the incorrectly identified BCM4328 chipset which is
actually a BCM4321 or BCM4322 chipset.
-------
LICENSE
-------
You must read the LICENSE.txt file in the docs directory before using this
software.
--------------------------
INSTALLATION & USAGE NOTES
--------------------------
This driver conflicts with the Linux community provided driver for Broadcom
hardware and cannot be used at the same time. It also conflicts with the ssb
driver and ndiswrapper Broadcom windows drivers.
To overcome these conflicts this package installs the file
/etc/modprobe.d/broadcom-wl-blacklist which blacklists the following kernel
modules to prevent them from loading:
b43
bcm43xx
ssb
ndiswrapper
If you require to use any of these modules for other installed hardware then
you will need to comment out the corresponding entry for that module. Note
that doing so may prevent this driver from functioning.
By default the wireless card used by this driver will usually be identified as
wlan0. If you wish to change the assigned device identifier then you should
create a new file in /etc/modprobe.d/ and add an alias for the wl module. For
example:
echo "alias eth0 wl" > /etc/modprobe.d/broadcom-wl-alias
--- NEW FILE broadcom-wl-blacklist ---
# modules blacklisted for broadcom-wl
blacklist bcm43xx
blacklist ssb
blacklist b43
blacklist ndiswrapper
--- NEW FILE broadcom-wl.spec ---
Name: broadcom-wl
Version: 5.10.27.6
Release: 3%{?dist}
Summary: Common files for Broadcom 802.11 STA driver
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://www.broadcom.com/support/802.11/linux_sta.php
Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32_5_10_27_6.ta...
Source1: http://www.broadcom.com/docs/linux_sta/README.txt
Source2: broadcom-wl-blacklist
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Provides: wl-kmod-common = %{version}
Requires: wl-kmod >= %{version}
%description
This package contains the license, readme and configuration files
for the Broadcom 802.11 Linux STA Driver for WiFi, a linux device
driver for use with Broadcom's BCM4311-, BCM4312-, BCM4321-, and
BCM4322-based hardware.
%prep
%setup -q -c
iconv -f iso8859-1 -t UTF8 lib/LICENSE.txt -o lib/LICENSE.txt
sed -i 's/\r$//' lib/LICENSE.txt
cp -p %{SOURCE1} .
chmod 644 lib/LICENSE.txt README.txt
%build
echo "Nothing to build."
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/modprobe.d/
install -p -m0644 %{SOURCE2} ${RPM_BUILD_ROOT}/%{_sysconfdir}/modprobe.d/
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc lib/LICENSE.txt README.txt
%config(noreplace) %{_sysconfdir}/modprobe.d/broadcom-wl-blacklist
%changelog
* Fri Nov 07 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.6-3
- Updated README.txt file
- Cleaned up spec file
* Sun Nov 02 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.6-2
- Added README.txt file
- Added /etc/modprobe.d/broadcom-wl-blacklist
* Thu Oct 30 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.6-1
- Initial Build
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 7 Nov 2008 09:05:45 -0000 1.1
+++ .cvsignore 7 Nov 2008 21:47:04 -0000 1.2
@@ -0,0 +1 @@
+hybrid-portsrc-x86_32_5_10_27_6.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 7 Nov 2008 09:05:45 -0000 1.1
+++ sources 7 Nov 2008 21:47:04 -0000 1.2
@@ -0,0 +1 @@
+7f50d89179e637225bd97022b323c27e hybrid-portsrc-x86_32_5_10_27_6.tar.gz
16 years, 1 month
rpms/broadcom-wl/F-9 README.txt, NONE, 1.1 broadcom-wl-blacklist, NONE, 1.1 broadcom-wl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Chris Nolan
Author: cnolan
Update of /cvs/nonfree/rpms/broadcom-wl/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21746/F-9
Modified Files:
.cvsignore sources
Added Files:
README.txt broadcom-wl-blacklist broadcom-wl.spec
Log Message:
Initial import
--- NEW FILE README.txt ---
-------
GENERAL
-------
This is an OFFICAL-RELEASE of Broadcom's IEEE 802.11a/b/g/n hybrid Linux device
driver for use with Broadcom's BCM4311-, BCM4312-, BCM4321-, and BCM4322-based
hardware.
This driver also supports the incorrectly identified BCM4328 chipset which is
actually a BCM4321 or BCM4322 chipset.
-------
LICENSE
-------
You must read the LICENSE.txt file in the docs directory before using this
software.
--------------------------
INSTALLATION & USAGE NOTES
--------------------------
This driver conflicts with the Linux community provided driver for Broadcom
hardware and cannot be used at the same time. It also conflicts with the ssb
driver and ndiswrapper Broadcom windows drivers.
To overcome these conflicts this package installs the file
/etc/modprobe.d/broadcom-wl-blacklist which blacklists the following kernel
modules to prevent them from loading:
b43
bcm43xx
ssb
ndiswrapper
If you require to use any of these modules for other installed hardware then
you will need to comment out the corresponding entry for that module. Note
that doing so may prevent this driver from functioning.
By default the wireless card used by this driver will usually be identified as
wlan0. If you wish to change the assigned device identifier then you should
create a new file in /etc/modprobe.d/ and add an alias for the wl module. For
example:
echo "alias eth0 wl" > /etc/modprobe.d/broadcom-wl-alias
--- NEW FILE broadcom-wl-blacklist ---
# modules blacklisted for broadcom-wl
blacklist bcm43xx
blacklist ssb
blacklist b43
blacklist ndiswrapper
--- NEW FILE broadcom-wl.spec ---
Name: broadcom-wl
Version: 5.10.27.6
Release: 3%{?dist}
Summary: Common files for Broadcom 802.11 STA driver
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://www.broadcom.com/support/802.11/linux_sta.php
Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32_5_10_27_6.ta...
Source1: http://www.broadcom.com/docs/linux_sta/README.txt
Source2: broadcom-wl-blacklist
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Provides: wl-kmod-common = %{version}
Requires: wl-kmod >= %{version}
%description
This package contains the license, readme and configuration files
for the Broadcom 802.11 Linux STA Driver for WiFi, a linux device
driver for use with Broadcom's BCM4311-, BCM4312-, BCM4321-, and
BCM4322-based hardware.
%prep
%setup -q -c
iconv -f iso8859-1 -t UTF8 lib/LICENSE.txt -o lib/LICENSE.txt
sed -i 's/\r$//' lib/LICENSE.txt
cp -p %{SOURCE1} .
chmod 644 lib/LICENSE.txt README.txt
%build
echo "Nothing to build."
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/modprobe.d/
install -p -m0644 %{SOURCE2} ${RPM_BUILD_ROOT}/%{_sysconfdir}/modprobe.d/
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc lib/LICENSE.txt README.txt
%config(noreplace) %{_sysconfdir}/modprobe.d/broadcom-wl-blacklist
%changelog
* Fri Nov 07 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.6-3
- Updated README.txt file
- Cleaned up spec file
* Sun Nov 02 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.6-2
- Added README.txt file
- Added /etc/modprobe.d/broadcom-wl-blacklist
* Thu Oct 30 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.6-1
- Initial Build
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 7 Nov 2008 09:05:45 -0000 1.1
+++ .cvsignore 7 Nov 2008 21:38:56 -0000 1.2
@@ -0,0 +1 @@
+hybrid-portsrc-x86_32_5_10_27_6.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 7 Nov 2008 09:05:45 -0000 1.1
+++ sources 7 Nov 2008 21:38:56 -0000 1.2
@@ -0,0 +1 @@
+7f50d89179e637225bd97022b323c27e hybrid-portsrc-x86_32_5_10_27_6.tar.gz
16 years, 1 month
rpms/broadcom-wl/devel README.txt, NONE, 1.1 broadcom-wl-blacklist, NONE, 1.1 broadcom-wl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Chris Nolan
Author: cnolan
Update of /cvs/nonfree/rpms/broadcom-wl/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19326/devel
Modified Files:
.cvsignore sources
Added Files:
README.txt broadcom-wl-blacklist broadcom-wl.spec
Log Message:
Initial import
--- NEW FILE README.txt ---
-------
GENERAL
-------
This is an OFFICAL-RELEASE of Broadcom's IEEE 802.11a/b/g/n hybrid Linux device
driver for use with Broadcom's BCM4311-, BCM4312-, BCM4321-, and BCM4322-based
hardware.
This driver also supports the incorrectly identified BCM4328 chipset which is
actually a BCM4321 or BCM4322 chipset.
-------
LICENSE
-------
You must read the LICENSE.txt file in the docs directory before using this
software.
--------------------------
INSTALLATION & USAGE NOTES
--------------------------
This driver conflicts with the Linux community provided driver for Broadcom
hardware and cannot be used at the same time. It also conflicts with the ssb
driver and ndiswrapper Broadcom windows drivers.
To overcome these conflicts this package installs the file
/etc/modprobe.d/broadcom-wl-blacklist which blacklists the following kernel
modules to prevent them from loading:
b43
bcm43xx
ssb
ndiswrapper
If you require to use any of these modules for other installed hardware then
you will need to comment out the corresponding entry for that module. Note
that doing so may prevent this driver from functioning.
By default the wireless card used by this driver will usually be identified as
wlan0. If you wish to change the assigned device identifier then you should
create a new file in /etc/modprobe.d/ and add an alias for the wl module. For
example:
echo "alias eth0 wl" > /etc/modprobe.d/broadcom-wl-alias
--- NEW FILE broadcom-wl-blacklist ---
# modules blacklisted for broadcom-wl
blacklist bcm43xx
blacklist ssb
blacklist b43
blacklist ndiswrapper
--- NEW FILE broadcom-wl.spec ---
Name: broadcom-wl
Version: 5.10.27.6
Release: 3%{?dist}
Summary: Common files for Broadcom 802.11 STA driver
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://www.broadcom.com/support/802.11/linux_sta.php
Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32_5_10_27_6.ta...
Source1: http://www.broadcom.com/docs/linux_sta/README.txt
Source2: broadcom-wl-blacklist
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Provides: wl-kmod-common = %{version}
Requires: wl-kmod >= %{version}
%description
This package contains the license, readme and configuration files
for the Broadcom 802.11 Linux STA Driver for WiFi, a linux device
driver for use with Broadcom's BCM4311-, BCM4312-, BCM4321-, and
BCM4322-based hardware.
%prep
%setup -q -c
iconv -f iso8859-1 -t UTF8 lib/LICENSE.txt -o lib/LICENSE.txt
sed -i 's/\r$//' lib/LICENSE.txt
cp -p %{SOURCE1} .
chmod 644 lib/LICENSE.txt README.txt
%build
echo "Nothing to build."
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/modprobe.d/
install -p -m0644 %{SOURCE2} ${RPM_BUILD_ROOT}/%{_sysconfdir}/modprobe.d/
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc lib/LICENSE.txt README.txt
%config(noreplace) %{_sysconfdir}/modprobe.d/broadcom-wl-blacklist
%changelog
* Fri Nov 07 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.6-3
- Updated README.txt file
- Cleaned up spec file
* Sun Nov 02 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.6-2
- Added README.txt file
- Added /etc/modprobe.d/broadcom-wl-blacklist
* Thu Oct 30 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.6-1
- Initial Build
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 7 Nov 2008 09:05:45 -0000 1.1
+++ .cvsignore 7 Nov 2008 21:01:54 -0000 1.2
@@ -0,0 +1 @@
+hybrid-portsrc-x86_32_5_10_27_6.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 7 Nov 2008 09:05:45 -0000 1.1
+++ sources 7 Nov 2008 21:01:54 -0000 1.2
@@ -0,0 +1 @@
+7f50d89179e637225bd97022b323c27e hybrid-portsrc-x86_32_5_10_27_6.tar.gz
16 years, 1 month
rpms/x264/devel x264.spec,1.2,1.3
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/x264/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18415
Modified Files:
x264.spec
Log Message:
* Fri Nov 07 2008 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.17.20080905
- build libs without asm optimizations for less capable x86 CPUs (livna bug #2066)
- fix missing 0 in Obsoletes version (never caused any problems)
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- x264.spec 5 Sep 2008 10:20:21 -0000 1.2
+++ x264.spec 7 Nov 2008 20:49:39 -0000 1.3
@@ -3,7 +3,7 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.0.0
-Release: 0.16.%{snapshot}%{?dist}
+Release: 0.17.%{snapshot}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
@@ -22,6 +22,7 @@
%ifarch x86_64 %{ix86}
BuildRequires: yasm
%endif
+Requires: %{name}-libs = %{version}-%{release}
%description
x264 is a free library for encoding H264/AVC video streams, written from
@@ -32,7 +33,7 @@
%package libs
Summary: Library for encoding H264/AVC video streams
Group: Development/Libraries
-Obsoletes: x264 < 0.0.0-0.13.2008420
+Obsoletes: x264 < 0.0.0-0.13.20080420
%description libs
x264 is a free library for encoding H264/AVC video streams, written from
@@ -79,6 +80,22 @@
This package contains the GUI development files.
+%define x_configure \
+./configure \\\
+ --host=%{_target_platform} \\\
+ --prefix=%{_prefix} \\\
+ --exec-prefix=%{_exec_prefix} \\\
+ --bindir=%{_bindir} \\\
+ --includedir=%{_includedir} \\\
+ --extra-cflags="$RPM_OPT_FLAGS" \\\
+ %{?_with_gpac:--enable-mp4-output} \\\
+ %{?_with_visualize:--enable-visualize} \\\
+ --enable-pthread \\\
+ --enable-debug \\\
+ --enable-shared \\\
+ --enable-pic
+
+
%prep
%setup -q -n %{name}-%{snapshot}
%patch0 -p1 -b .r
@@ -86,25 +103,29 @@
iconv -f iso-8859-1 -t utf-8 -o AUTHORS.utf8 AUTHORS
mv -f AUTHORS.utf8 AUTHORS
convert gtk/x264.ico x264icon.png
+%ifarch %{ix86}
+mkdir sse2
+cp -a `ls -1|grep -v sse2` sse2/
+%endif
%build
-./configure \
- --host=%{_target_platform} \
- --prefix=%{_prefix} \
- --exec-prefix=%{_exec_prefix} \
- --bindir=%{_bindir} \
- --includedir=%{_includedir} \
+%{x_configure}\
--libdir=%{_libdir} \
- --extra-cflags="$RPM_OPT_FLAGS" \
- %{?_with_gpac:--enable-mp4-output} \
- %{?_with_visualize:--enable-visualize} \
- --enable-pthread \
- --enable-debug \
- --enable-shared \
--enable-gtk \
- --enable-pic
+%ifarch %{ix86}
+ --disable-asm
+%endif
+
+%{__make} %{?_smp_mflags}
+%ifarch %{ix86}
+pushd sse2
+%{x_configure}\
+ --libdir=%{_libdir}/sse2 \
+ --disable-gtk
%{__make} %{?_smp_mflags}
+popd
+%endif
%install
%{__rm} -rf %{buildroot}
@@ -118,6 +139,13 @@
%{__install} -Dpm 644 x264icon.png \
%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%ifarch %{ix86}
+pushd sse2
+%{__make} DESTDIR=%{buildroot} install
+popd
+rm %{buildroot}%{_libdir}/sse2/pkgconfig/x264.pc
+%endif
+
%find_lang %{name}_gtk
%clean
@@ -149,6 +177,9 @@
%files libs
%defattr(644, root, root, 0755)
%{_libdir}/libx264.so.*
+%ifarch %{ix86}
+%{_libdir}/sse2/libx264.so.*
+%endif
%files devel
%defattr(644, root, root, 0755)
@@ -156,6 +187,9 @@
%{_includedir}/x264.h
%{_libdir}/libx264.so
%{_libdir}/pkgconfig/%{name}.pc
+%ifarch %{ix86}
+%{_libdir}/sse2/libx264.so
+%endif
%files gui -f %{name}_gtk.lang
%defattr(644, root, root, 0755)
@@ -172,6 +206,10 @@
%{_libdir}/pkgconfig/%{name}gtk.pc
%changelog
+* Fri Nov 07 2008 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.17.20080905
+- build libs without asm optimizations for less capable x86 CPUs (livna bug #2066)
+- fix missing 0 in Obsoletes version (never caused any problems)
+
* Fri Sep 05 2008 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.16.20080905
- 20080905 snapshot
- use yasm on all supported arches
16 years, 1 month
rpms/buildsys-build-rpmfusion/F-9 buildsys-build-rpmfusion.spec, 1.6, 1.7
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28278
Modified Files:
buildsys-build-rpmfusion.spec
Log Message:
* Fri Nov 07 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9:9.1-19
- rebuilt
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-9/buildsys-build-rpmfusion.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- buildsys-build-rpmfusion.spec 7 Nov 2008 07:01:33 -0000 1.6
+++ buildsys-build-rpmfusion.spec 7 Nov 2008 13:37:32 -0000 1.7
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 9
Version: 9.1
-Release: 18
+Release: 19
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -126,6 +126,9 @@
%changelog
+* Fri Nov 07 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9:9.1-19
+- rebuilt
+
* Fri Nov 07 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9:9.1-18
- rebuild for kernels 2.6.25.3-2.fc9xen 2.6.27.4-26.fc9
16 years, 1 month
rpms/buildsys-build-rpmfusion/devel buildsys-build-rpmfusion.spec, 1.8, 1.9
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/buildsys-build-rpmfusion/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27893
Modified Files:
buildsys-build-rpmfusion.spec
Log Message:
* Fri Nov 07 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:10-0.7
- rebuilt
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/devel/buildsys-build-rpmfusion.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- buildsys-build-rpmfusion.spec 2 Nov 2008 14:13:34 -0000 1.8
+++ buildsys-build-rpmfusion.spec 7 Nov 2008 13:34:42 -0000 1.9
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 10
-Release: 0.6
+Release: 0.7
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -100,6 +100,9 @@
%changelog
+* Fri Nov 07 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:10-0.7
+- rebuilt
+
* Sun Nov 02 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:10-0.6
- rebuild for kernel 2.6.27.4-68.fc10
16 years, 1 month
rpms/xorg-x11-drv-nvidia-173xx/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/nonfree/owners/tmpcvse14528/rpms/xorg-x11-drv-nvidia-173xx/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module xorg-x11-drv-nvidia-173xx
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: xorg-x11-drv-nvidia-173xx
# $Id: Makefile,v 1.1 2008/11/07 09:16:07 thl Exp $
NAME := xorg-x11-drv-nvidia-173xx
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
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
16 years, 1 month
rpms/xorg-x11-drv-nvidia-173xx Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/nonfree/owners/tmpcvse14528/rpms/xorg-x11-drv-nvidia-173xx
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module xorg-x11-drv-nvidia-173xx
--- NEW FILE Makefile ---
# Top level Makefile for module xorg-x11-drv-nvidia-173xx
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
--- NEW FILE pkg.acl ---
16 years, 1 month
rpms/xorg-x11-drv-nvidia-173xx/devel - New directory
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/nonfree/owners/tmpcvse14528/rpms/xorg-x11-drv-nvidia-173xx/devel
Log Message:
Directory /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/devel added to the repository
16 years, 1 month