summaryrefslogtreecommitdiffstats
path: root/freed-ora
diff options
context:
space:
mode:
authorAlexandre Oliva <lxoliva@fsfla.org>2014-12-07 19:35:16 +0000
committerAlexandre Oliva <lxoliva@fsfla.org>2014-12-07 19:35:16 +0000
commit1980420026e53c2ec2d471f57111bed039f3f8cf (patch)
treeeaf10c90865b4d7dbef3208a7d6990623215a805 /freed-ora
parentfb24ef27243f9764697b6884b1cbdc593879178f (diff)
downloadlinux-libre-raptor-1980420026e53c2ec2d471f57111bed039f3f8cf.tar.gz
linux-libre-raptor-1980420026e53c2ec2d471f57111bed039f3f8cf.zip
freed-ora-8-1
Diffstat (limited to 'freed-ora')
-rw-r--r--freed-ora/freed-ora-pkg/master/freed-ora-detesting.repo7
-rw-r--r--freed-ora/freed-ora-pkg/master/freed-ora-testing.repo7
-rw-r--r--freed-ora/freed-ora-pkg/master/freed-ora.repo7
-rw-r--r--freed-ora/freed-ora-pkg/master/freed-ora.spec72
4 files changed, 76 insertions, 17 deletions
diff --git a/freed-ora/freed-ora-pkg/master/freed-ora-detesting.repo b/freed-ora/freed-ora-pkg/master/freed-ora-detesting.repo
index 6a770b079..a1649e9f0 100644
--- a/freed-ora/freed-ora-pkg/master/freed-ora-detesting.repo
+++ b/freed-ora/freed-ora-pkg/master/freed-ora-detesting.repo
@@ -2,8 +2,10 @@
name=Linux-libre Freed-ora $releasever - Random builds
baseurl=http://linux-libre.fsfla.org/pub/linux-libre/freed-ora/F-$releasever-detesting
http://ftp.linux.org.tr/linux-libre/freed-ora/F-$releasever-detesting
+ http://mirror.espoch.edu.ec/linux-libre/freed-ora/F-$releasever-detesting
+ http://linux-libre.gnulinux.si/freed-ora/F-$releasever-detesting
+ http://mirror.cedia.org.ec/linux-libre/freed-ora/F-$releasever-detesting
http://www.fsfla.org/~lxoliva/fsfla/linux-libre/freed-ora/F-$releasever-detesting
- http://www.lsd.ic.unicamp.br/~oliva/fsfla/linux-libre/freed-ora/F-$releasever-detesting
enabled=0
metadata_expire=7d
gpgcheck=1
@@ -12,7 +14,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-freed-ora-linux-libre
[freed-ora-detesting-debuginfo]
name=Linux-libre Freed-ora $releasever - Random builds - Debug
baseurl=http://linux-libre.fsfla.org/pub/linux-libre/freed-ora/debuginfo/F-$releasever-detesting
- http://ftp.linux.org.tr/linux-libre/freed-ora/debuginfo/F-$releasever-detesting
+ http://mirror.espoch.edu.ec/linux-libre/freed-ora/debuginfo/F-$releasever-detesting
+ http://mirror.cedia.org.ec/linux-libre/freed-ora/debuginfo/F-$releasever-detesting
enabled=0
metadata_expire=7d
gpgcheck=1
diff --git a/freed-ora/freed-ora-pkg/master/freed-ora-testing.repo b/freed-ora/freed-ora-pkg/master/freed-ora-testing.repo
index 2e8156c35..3c74b0638 100644
--- a/freed-ora/freed-ora-pkg/master/freed-ora-testing.repo
+++ b/freed-ora/freed-ora-pkg/master/freed-ora-testing.repo
@@ -2,8 +2,10 @@
name=Linux-libre Freed-ora $releasever - Test builds
baseurl=http://linux-libre.fsfla.org/pub/linux-libre/freed-ora/F-$releasever-testing
http://ftp.linux.org.tr/linux-libre/freed-ora/F-$releasever-testing
+ http://mirror.espoch.edu.ec/linux-libre/freed-ora/F-$releasever
+ http://linux-libre.gnulinux.si/freed-ora/F-$releasever-testing
+ http://mirror.cedia.org.ec/linux-libre/freed-ora/F-$releasever
http://www.fsfla.org/~lxoliva/fsfla/linux-libre/freed-ora/F-$releasever-testing
- http://www.lsd.ic.unicamp.br/~oliva/fsfla/linux-libre/freed-ora/F-$releasever-testing
enabled=0
metadata_expire=7d
gpgcheck=1
@@ -12,7 +14,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-freed-ora-linux-libre
[freed-ora-testing-debuginfo]
name=Linux-libre Freed-ora $releasever - Test builds - Debug
baseurl=http://linux-libre.fsfla.org/pub/linux-libre/freed-ora/debuginfo/F-$releasever-testing
- http://ftp.linux.org.tr/linux-libre/freed-ora/debuginfo/F-$releasever-testing
+ http://mirror.espoch.edu.ec/linux-libre/freed-ora/debuginfo/F-$releasever-testing
+ http://mirror.cedia.org.ec/linux-libre/freed-ora/debuginfo/F-$releasever-testing
enabled=0
metadata_expire=7d
gpgcheck=1
diff --git a/freed-ora/freed-ora-pkg/master/freed-ora.repo b/freed-ora/freed-ora-pkg/master/freed-ora.repo
index c2d7bfb00..2060d69a2 100644
--- a/freed-ora/freed-ora-pkg/master/freed-ora.repo
+++ b/freed-ora/freed-ora-pkg/master/freed-ora.repo
@@ -2,8 +2,10 @@
name=Linux-libre Freed-ora $releasever - Released builds
baseurl=http://linux-libre.fsfla.org/pub/linux-libre/freed-ora/F-$releasever
http://ftp.linux.org.tr/linux-libre/freed-ora/F-$releasever
+ http://mirror.espoch.edu.ec/linux-libre/freed-ora/F-$releasever
+ http://linux-libre.gnulinux.si/freed-ora/F-$releasever
+ http://mirror.cedia.org.ec/linux-libre/freed-ora/F-$releasever
http://www.fsfla.org/~lxoliva/fsfla/linux-libre/freed-ora/F-$releasever
- http://www.lsd.ic.unicamp.br/~oliva/fsfla/linux-libre/freed-ora/F-$releasever
enabled=1
metadata_expire=7d
gpgcheck=1
@@ -12,7 +14,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-freed-ora-linux-libre
[freed-ora-debuginfo]
name=Linux-libre Freed-ora $releasever - Released builds - Debug
baseurl=http://linux-libre.fsfla.org/pub/linux-libre/freed-ora/debuginfo/F-$releasever
- http://ftp.linux.org.tr/linux-libre/freed-ora/debuginfo/F-$releasever
+ http://mirror.espoch.edu.ec/linux-libre/freed-ora/debuginfo/F-$releasever
+ http://mirror.cedia.org.ec/linux-libre/freed-ora/debuginfo/F-$releasever
enabled=0
metadata_expire=7d
gpgcheck=1
diff --git a/freed-ora/freed-ora-pkg/master/freed-ora.spec b/freed-ora/freed-ora-pkg/master/freed-ora.spec
index 74acb8085..2773244d1 100644
--- a/freed-ora/freed-ora-pkg/master/freed-ora.spec
+++ b/freed-ora/freed-ora-pkg/master/freed-ora.spec
@@ -1,5 +1,5 @@
Name: freed-ora
-Version: 7
+Version: 8
Release: 1
Summary: Linux-libre Freed-ora packages
@@ -66,7 +66,7 @@ rm -rf $RPM_BUILD_ROOT
Summary: Meta-package that conflicts with non-Free components in Fedora
Group: System Environment/Base
-%define kernelpkgs kernel-firmware, kernel-headers, kernel-doc, kernel, kernel-devel, kernel-PAE, kernel-PAE-devel, kernel-debug, kernel-debug-devel, kernel-PAEdebug, kernel-PAEdebug-devel, kernel-debuginfo, kernel-debug-debuginfo, kernel-PAE-debuginfo, kernel-PAEdebug-debuginfo, kernel-debuginfo-common-i686, kernel-debuginfo-common-x86_64, perf
+%define kernelpkgs kernel, kernel-PAE, kernel-PAE-core, kernel-PAE-debuginfo, kernel-PAE-devel, kernel-PAE-modules, kernel-PAE-modules-extra, kernel-PAEdebug, kernel-PAEdebug-core, kernel-PAEdebug-debuginfo, kernel-PAEdebug-devel, kernel-PAEdebug-modules, kernel-PAEdebug-modules-extra, kernel-core, kernel-debug, kernel-debug-core, kernel-debug-debuginfo, kernel-debug-devel, kernel-debug-modules, kernel-debug-modules-extra, kernel-debuginfo, kernel-debuginfo-common-i686, kernel-debuginfo-common-x86_64, kernel-devel, kernel-doc, kernel-firmware, kernel-headers, kernel-modules, kernel-modules-extra, kernel-tools, kernel-tools-debuginfo, kernel-tools-libs, kernel-tools-libs-devel, perf, perf-debuginfo, python-perf, python-perf-debuginfo
# We can't conflict with these, because kernel-libre packages provide them.
# Conflicts: %{kernelpkgs}
@@ -75,17 +75,31 @@ Group: System Environment/Base
# are plenty of sourceless binary images in the packages.
Conflicts: aic94xx-firmware
Conflicts: alsa-firmware
+Conflicts: alsa-tools-firmware
Conflicts: ar9170-firmware
Conflicts: atmel-firmware
Conflicts: bfa-firmware
Conflicts: crystalhd-firmware
Conflicts: cx18-firmware
+# These firmware-* packages could be ok, but their only use is to deal
+# with non-Free Software:
+Conflicts: firmware-addon-dell
+Conflicts: firmware-extract
+Conflicts: firmware-tools
+Conflicts: iguanaIR-firmware
Conflicts: ipw2100-firmware
Conflicts: ipw2200-firmware
+Conflicts: ipw3945-ucode
Conflicts: iscan-firmware
+Conflicts: isight-firmware-tools
Conflicts: ivtv-firmware
Conflicts: iwl100-firmware
Conflicts: iwl1000-firmware
+Conflicts: iwl105-firmware
+Conflicts: iwl135-firmware
+Conflicts: iwl2000-firmware
+Conflicts: iwl2030-firmware
+Conflicts: iwl3160-firmware
Conflicts: iwl3945-firmware
Conflicts: iwl4965-firmware
Conflicts: iwl5000-firmware
@@ -94,9 +108,15 @@ Conflicts: iwl6000-firmware
Conflicts: iwl6000g2a-firmware
Conflicts: iwl6000g2b-firmware
Conflicts: iwl6050-firmware
+Conflicts: iwl7260-firmware
+Conflicts: iwlwifi-3945-ucode
+Conflicts: iwlwifi-4965-ucode
Conflicts: libertas-sd8686-firmware
+Conflicts: libertas-sd8787-firmware
Conflicts: libertas-usb8388-firmware
+Conflicts: libertas-usb8388-olpc-firmware
Conflicts: linux-firmware
+Conflicts: microcode_ctl
Conflicts: midisport-firmware
Conflicts: netxen-firmware
Conflicts: ql2100-firmware
@@ -106,10 +126,20 @@ Conflicts: ql2400-firmware
Conflicts: ql2500-firmware
Conflicts: rt61pci-firmware
Conflicts: rt73usb-firmware
+Conflicts: sigrok-firmware
+# This could be ok, but the license tag is wrong, and it mentions the
+# non-Free bits in its README:
+Conflicts: sigrok-firmware-filesystem
+# These are ok:
+# Conflicts: sigrok-firmware-free
+# Conflicts: sigrok-firmware-fx2lafw
+Conflicts: sigrok-firmware-nonfree
Conflicts: ueagle-atm4-firmware
+Conflicts: uhd-firmware
+Conflicts: ultimaker-marlin-firmware
+Conflicts: ultimaker2-marlin-firmware
Conflicts: xorg-x11-drv-ati-firmware
Conflicts: zd1211-firmware
-Conflicts: microcode_ctl
%description freedom
The freed-ora-freedom package is intended to conflict with all known
@@ -119,15 +149,16 @@ dealt with as an install-time error.
We cannot conflict with the kernel packages because the corresponding
kernel-libre packages must provide the same names to satisfy other
system-wide dependencies. Unfortunately, this means it is up to you
-to verify that you have none of kernel, kernel-doc, kernel-headers,
-kernel-devel, kernel-firmware, perf, and their -PAE, -debug, etc
-variants.
+to verify that you have none of kernel, kernel-core, kernel-modules*,
+kernel-doc, kernel-headers, kernel-devel, kernel-firmware,
+kernel-tools*, perf, python-perf, and their -PAE, -debug, etc variants
+or their debuginfo.
Once you do that, you may want to
-exclude=kernel*,perf,*-firmware,microcode_ctl from Fedora repos, to
-avoid accidents. The conflict markers in this package will actually
-prevent the installation of most of these packages, but not of the
-kernel ones: these will only get warnings from triggers.
+exclude=kernel*,perf,*-firmware,*-ucode,microcode_ctl from Fedora
+repos, to avoid accidents. The conflict markers in this package will
+actually prevent the installation of most of these packages, but not
+of the kernel ones: these will only get warnings from triggers.
%files freedom
%defattr(-,root,root,-)
@@ -152,6 +183,25 @@ echo Error: newly-installed package conflicts with freed-ora-freedom >&2
exit 1
%changelog
+* Sun Dec 7 2014 Alexandre Oliva <lxoliva@fsfla.org> - 8-1
+- Updated gnulinux.si mirror (was gnulinux.tv).
+- Dropped lsd.ic.unicamp.br mirror.
+- Added espoch and cedia mirrors in Ecuador.
+- Added *-core, *-modules, *-modules-extra, kernel-tools*, *perf* packages
+to Fedora kernelpkgs, reported in triggers.
+- Added conflicts to alsa-tools-firmware, firmware-addon-dell,
+firmware-extract, firmware-tools, iguanaIR-firmware, ipw3945-ucode,
+isight-firmware-tools, iwl105-firmware, iwl135-firmare,
+iwl2000-firmware, iwl2030-firmware, iwl31360-firmware,
+iwl7260-firmware, iwlwifi-3945-ucode, iwlwifi-4965-ucode,
+libertas-sd8787-firmware, libertas-usb8388-olpc-firmware,
+sigrok-firmware, sigrok-firmware-filesystem, sigrok-firmware-nonfree,
+udh-firmware, ultimaker-marlin-firmware, and
+ultimaker2-marlin-firmware.
+- Justify conflicts with firmware-addon-dell, firmware-extract,
+firmware-tools, and sigrok-firmware-filesystem.
+- Do NOT conflict with sigrok-firmware-free and sigrok-firmware-fx2lafw.
+
* Fri Jul 22 2011 Alexandre Oliva <lxoliva@fsfla.org> - 7-1
- Added linux.org.tr mirror.
@@ -176,5 +226,5 @@ Everything/ but not in Fedora/.
- Trigger -freedom error report on non-Free kernel package installs.
- Change kernel default to -libre on -freedom.
-* Sun Nov 29 2010 Alexandre Oliva <lxoliva@fsfla.org> - 1-1
+* Mon Nov 29 2010 Alexandre Oliva <lxoliva@fsfla.org> - 1-1
- Initial RPM release.
OpenPOWER on IntegriCloud