Drop Ti stuff from master

diff --git a/poldek-multilib-ti.conf b/poldek-multilib-ti.conf
deleted file mode 100644 (file)
index 67a9f0f..0000000
--- a/poldek-multilib-ti.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-# PLD Titanium (Ti), multilib config
-# Unofficial version of PLD Linux Distribution
-# http://www.pld-linux.org/Titanium
-
-_arch   = %ARCH%
-_prefix = ftp://ftp.titanium.pld-linux.org/branches/titanium
-
-############################################################
-
-###
-# PLD Linux Titanium (Ti) Stable version
-[source]
-type   = pndir
-name   = ti-%{_arch}
-path   = %{_prefix}/stable/PLD/%{_arch}/RPMS/
-auto   = no
-autoup = no
-
-###
-# PLD Linux Titanium (Ti) Stable version, test packages
-[source]
-type   = pndir
-name   = ti-test-%{_arch}
-path   = %{_prefix}/stable/test/%{_arch}/RPMS/
-auto   = no
-autoup = no
-
-############################################################
-
-###
-# PLD Linux Titanium (Ti) Devel version
-[source]
-type   = pndir
-name   = ti-dev-%{_arch}
-path   = %{_prefix}/devel/PLD/%{_arch}/RPMS/
-auto   = no
-autoup = no
-
-###
-# PLD Linux Titanium (Ti) Devel version, test packages
-[source]
-type   = pndir
-name   = ti-dev-test-%{_arch}
-path   = %{_prefix}/devel/test/%{_arch}/RPMS/
-auto   = no
-autoup = no

diff --git a/poldek-ti.conf b/poldek-ti.conf
deleted file mode 100644 (file)
index 71591a6..0000000
--- a/poldek-ti.conf
+++ /dev/null
@@ -1,84 +0,0 @@
-# PLD Titanium (Ti)
-# Unofficial version of PLD Linux Distribution
-# http://www.pld-linux.org/Titanium
-
-_arch   = %ARCH%
-_prefix = ftp://ftp.titanium.pld-linux.org/branches/titanium
-
-############################################################
-
-###
-# PLD Linux Titanium (Ti) Stable version
-[source]
-type   = pndir
-name   = ti
-path   = %{_prefix}/stable/PLD/%{_arch}/RPMS/
-
-[source]
-type   = pndir
-name   = ti
-path   = %{_prefix}/stable/PLD/noarch/RPMS/
-
-###
-# PLD Linux Titanium (Ti) Stable version, test packages
-[source]
-type   = pndir
-name   = ti-test
-path   = %{_prefix}/stable/test/%{_arch}/RPMS/
-auto   = no
-autoup = no
-
-[source]
-type   = pndir
-name   = ti-test
-path   = %{_prefix}/stable/test/noarch/RPMS/
-auto   = no
-autoup = no
-
-###
-# PLD Linux Titanium (Ti) Stable version, old packages
-[source]
-type   = pndir
-name   = ti-archive
-path   = %{_prefix}/stable/archive/%{_arch}/RPMS/
-auto   = no
-
-[source]
-type   = pndir
-name   = ti-archive
-path   = %{_prefix}/stable/archive/noarch/RPMS/
-auto   = no
-
-############################################################
-
-###
-# PLD Linux Titanium (Ti) Devel version
-[source]
-type   = pndir
-name   = ti-dev
-path   = %{_prefix}/devel/PLD/%{_arch}/RPMS/
-auto   = no
-autoup = no
-
-[source]
-type   = pndir
-name   = ti-dev
-path   = %{_prefix}/devel/PLD/noarch/RPMS/
-auto   = no
-autoup = no
-
-###
-# PLD Linux Titanium (Ti) Devel version, test packages
-[source]
-type   = pndir
-name   = ti-dev-test
-path   = %{_prefix}/devel/test/%{_arch}/RPMS/
-auto   = no
-autoup = no
-
-[source]
-type   = pndir
-name   = ti-dev-test
-path   = %{_prefix}/devel/test/noarch/RPMS/
-auto   = no
-autoup = no

diff --git a/poldek.spec b/poldek.spec
index 2e04315d72618f65026ec0814f17b912c12d60ff..cf6ef3164bf7353c91546d0e56b29ae2b5910d1e 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -3,15 +3,11 @@
 %bcond_with    static  # don't use shared libraries
 %bcond_without imode   # don't build interactive mode
 %bcond_without python  # don't build python bindings
+%bcond_with    snap    # don't build python bindings
 
 # required versions (forced to avoid SEGV with mixed db used by rpm and poldek)
-%if "%{pld_release}" == "ti"
-%define        ver_db  4.5.20
-%define        ver_db_rel      8
-%else
 %define        ver_db  4.7.25
 %define        ver_db_rel      1
-%endif
 %define        ver_rpm 4.5-49
 
 %define                snap    rc5
@@ -29,8 +25,6 @@ Source0:      http://carme.pld-linux.org/~cactus/snaps/poldek/%{name}-%{version}%{sna
 # Source0-md5: ab89926c28cfb6b7d72497fc37c16ac4
 Source1:       %{name}.conf
 Source2:       %{name}-multilib.conf
-Source3:       %{name}-ti.conf
-Source4:       %{name}-multilib-ti.conf
 Source5:       %{name}-aliases.conf
 Source6:       %{name}.desktop
 Source7:       %{name}.png
@@ -266,49 +260,34 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name}/repos.d,/var/cache/%{name}}
        %define         _ftp_alt_arch   i686
 %endif
 %ifarch i586
-       %if "%{pld_release}" == "ti"
-               %define         _ftp_arch       i586
-       %else
-               %define         _ftp_arch       i486
-       %endif
+       %define         _ftp_arch       i486
 %endif
 %ifarch pentium2 pentium3 pentium4
        %define         _ftp_arch       i686
 %endif
 %ifarch sparcv9 sparc64
        %define         _ftp_arch       sparc
-       %if "%{pld_release}" == "th"
-               %define         _ftp_arch       %{_target_cpu}
-               %ifarch sparc64
+       %define         _ftp_arch       %{_target_cpu}
+       %ifarch sparc64
                %define         _ftp_alt_arch   sparcv9
-               %endif
        %endif
 %endif
 
-%if "%{pld_release}" == "ti"
-       %define pld_conf %{SOURCE3}
-       %ifarch %{x8664}
-               %define pld_multilib_conf %{SOURCE4}
-       %endif
-%endif
+%define        pld_conf %{SOURCE1}
+%define        pld_debuginfo_conf %{SOURCE8}
+%define        pld_archive_conf %{SOURCE11}
 
-%if "%{pld_release}" == "th"
-       %define pld_conf %{SOURCE1}
-       %define pld_debuginfo_conf %{SOURCE8}
-       %define pld_archive_conf %{SOURCE11}
-
-       %ifarch %{x8664}
-               %define pld_multilib_conf %{SOURCE2}
-       %endif
+%ifarch %{x8664}
+       %define pld_multilib_conf %{SOURCE2}
+%endif
 
-       # aidath
-       %ifarch sparcv9 sparc64
-               %define pld_conf %{SOURCE9}
-               %undefine pld_archive_conf
-       %endif
-       %ifarch sparc64
-               %define pld_multilib_conf %{SOURCE10}
-       %endif
+# aidath
+%ifarch sparcv9 sparc64
+       %define pld_conf %{SOURCE9}
+       %undefine pld_archive_conf
+%endif
+%ifarch sparc64
+       %define pld_multilib_conf %{SOURCE10}
 %endif
 
 sed -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{pld_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf