packages: smart/smart.spec, smart/th-archive.channel (NEW), smart/th-multil...

baggins baggins at pld-linux.org
Sun Jan 22 12:57:39 CET 2012


Author: baggins                      Date: Sun Jan 22 11:57:39 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 1
- added default th channels

---- Files affected:
packages/smart:
   smart.spec (1.45 -> 1.46) , th-archive.channel (NONE -> 1.1)  (NEW), th-multilib.channel (NONE -> 1.1)  (NEW), th-obsolete.channel (NONE -> 1.1)  (NEW), th-ready.channel (NONE -> 1.1)  (NEW), th-test.channel (NONE -> 1.1)  (NEW), th.channel (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/smart/smart.spec
diff -u packages/smart/smart.spec:1.45 packages/smart/smart.spec:1.46
--- packages/smart/smart.spec:1.45	Sat Jan 21 22:53:27 2012
+++ packages/smart/smart.spec	Sun Jan 22 12:57:33 2012
@@ -11,7 +11,7 @@
 Summary(pl.UTF-8):	Narzędzie do obsługi pakietów nowej generacji
 Name:		smart
 Version:	1.4.1
-Release:	0.2
+Release:	1
 License:	GPL v2+
 Group:		Applications/System
 Source0:	http://launchpad.net/smart/trunk/%{version}/+download/%{name}-%{version}.tar.bz2
@@ -19,6 +19,12 @@
 Source1:	%{name}-distro.py
 Source2:	%{name}.desktop
 Source3:	%{name}-kde.desktop
+Source4:	th.channel
+Source5:	th-archive.channel
+Source6:	th-multilib.channel
+Source7:	th-obsolete.channel
+Source8:	th-ready.channel
+Source9:	th-test.channel
 Patch0:		%{name}-syslibs.patch
 Patch1:		%{name}-pyc.patch
 Patch4:		%{name}-missingok.patch
@@ -132,7 +138,10 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_libdir}/smart,/var/lib/smart/{channels,packages}}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_libdir}/smart} \
+	$RPM_BUILD_ROOT/var/lib/smart/{channels,packages} \
+	$RPM_BUILD_ROOT/etc/smart/channels
+
 %{__python} setup.py install \
 	--skip-build \
 	--optimize=2 \
@@ -151,6 +160,25 @@
 	DESTDIR=$RPM_BUILD_ROOT
 %endif
 
+%ifarch i486 i686 ppc sparc alpha athlon
+	%define		_ftp_arch	%{_target_cpu}
+%endif
+%ifarch %{x8664}
+	%define		_ftp_arch	x86_64
+	%define		_pld_multilib_conf %{SOURCE6}
+%endif
+%ifarch i586
+	%define		_ftp_arch	i486
+%endif
+%ifarch pentium2 pentium3 pentium4
+	%define		_ftp_arch	i686
+%endif
+
+for f in %{SOURCE4} %{SOURCE5} %{SOURCE7} %{SOURCE8} %{SOURCE9} %{_pld_multilib_conf}; do
+	ff=$(basename $f)
+	%{__sed} -e 's|%%ARCH%%|%{_ftp_arch}|g' $f >$RPM_BUILD_ROOT/etc/smart/channels/$ff
+done
+
 mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{es_ES,es}
 
 touch $RPM_BUILD_ROOT/var/lib/smart/packages/{cache,config}
@@ -164,6 +192,8 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc HACKING README LICENSE TODO IDEAS
+%dir /etc/smart/channels
+%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/smart/channels/th*.channel
 %attr(755,root,root) %{_bindir}/smart
 %{_mandir}/man8/smart.8*
 %{_libdir}/smart
@@ -241,6 +271,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2012/01/22 11:57:33  baggins
+- rel 1
+- added default th channels
+
 Revision 1.45  2012/01/21 21:53:27  baggins
 - 1.4.1
 - updated patches

================================================================
Index: packages/smart/th-archive.channel
diff -u /dev/null packages/smart/th-archive.channel:1.1
--- /dev/null	Sun Jan 22 12:57:39 2012
+++ packages/smart/th-archive.channel	Sun Jan 22 12:57:33 2012
@@ -0,0 +1,11 @@
+[th-archive]
+name = PLD Linux 3.0 (Th) - %ARCH%
+baseurl = ftp://ftp.th.pld-linux.org/dists/th/.archive/PLD/%ARCH%/RPMS/
+type = rpm-md
+disabled=yes
+
+[th-archive-noarch]
+name = PLD Linux 3.0 (Th) - %ARCH%
+baseurl = ftp://ftp.th.pld-linux.org/dists/th/.archive/PLD/noarch/RPMS/
+type = rpm-md
+disabled=yes

================================================================
Index: packages/smart/th-multilib.channel
diff -u /dev/null packages/smart/th-multilib.channel:1.1
--- /dev/null	Sun Jan 22 12:57:39 2012
+++ packages/smart/th-multilib.channel	Sun Jan 22 12:57:33 2012
@@ -0,0 +1,47 @@
+[th-i686]
+name = PLD Linux 3.0 (Th) - i686
+baseurl = ftp://ftp.th.pld-linux.org/dists/th/PLD/i686/RPMS/
+type = rpm-md
+disabled=yes
+
+[th-i686-ready]
+name = PLD Linux 3.0 (Th) - i686: ready (testing stage before moved to main)
+baseurl = ftp://ftp.th.pld-linux.org/dists/th/ready/i686/RPMS/
+type = rpm-md
+disabled=yes
+
+[th-i686-test]
+name = PLD Linux 3.0 (Th) - i686: test (built packages to be moved to ready)
+baseurl = ftp://ftp.th.pld-linux.org/dists/th/test/i686/RPMS/
+type = rpm-md
+disabled=yes
+
+[th-i686-obsolete]
+name = PLD Linux 3.0 (Th) - i686: obsolete (kde3,...)
+baseurl = ftp://ftp.th.pld-linux.org/dists/th/test/i686/RPMS/
+type = rpm-md
+disabled=yes
+
+[th-i686-idebuginfo]
+name = PLD Linux 3.0 (Th) - i686 - debuginfo
+baseurl = ftp://ftp.th.pld-linux.org/dists/th/PLD/i686/debuginfo/
+type = rpm-md
+disabled=yes
+
+[th-i686-ready-debuginfo]
+name = PLD Linux 3.0 (Th) - i686 - debuginfo: ready (testing stage before moved to main)
+baseurl = ftp://ftp.th.pld-linux.org/dists/th/ready/i686/debuginfo/
+type = rpm-md
+disabled=yes
+
+[th-i686-test-debuginfo]
+name = PLD Linux 3.0 (Th) - i686 - debuginfo: test (built packages to be moved to ready)
+baseurl = ftp://ftp.th.pld-linux.org/dists/th/test/i686/debuginfo/
+type = rpm-md
+disabled=yes
+
+[th-i686-obsolete-debuginfo]
+name = PLD Linux 3.0 (Th) - i686 - debuginfo: obsolete (kde3,...)
+baseurl = ftp://ftp.th.pld-linux.org/dists/th/obsolete/i686/debuginfo/
+type = rpm-md
+disabled=yes

================================================================
Index: packages/smart/th-obsolete.channel
diff -u /dev/null packages/smart/th-obsolete.channel:1.1
--- /dev/null	Sun Jan 22 12:57:39 2012
+++ packages/smart/th-obsolete.channel	Sun Jan 22 12:57:33 2012
@@ -0,0 +1,23 @@
+[th-obsolete]
+name = PLD Linux 3.0 (Th) - %ARCH%: obsolete (kde3, ...)
+baseurl = ftp://ftp.th.pld-linux.org/dists/th/obsolete/%ARCH%/RPMS/
+type = rpm-md
+disabled=yes
+
+[th-obsolete-noarch]
+name = PLD Linux 3.0 (Th) - noarch: obsolete (kde3, ...)
+baseurl = ftp://ftp.th.pld-linux.org/dists/th/obsolete/noarch/RPMS/
+type = rpm-md
+disabled=yes
+
+[th-obsolete-debuginfo]
+name = PLD Linux 3.0 (Th) - %ARCH% - debuginfo: obsolete (kde3, ...)
+baseurl = ftp://ftp.th.pld-linux.org/dists/th/obsolete/%ARCH%/debuginfo/
+type = rpm-md
+disabled=yes
+
+[th-obsolete-source]
+name = PLD Linux 3.0 (Th) - SRPMS: obsolete (kde3, ...)
+baseurl = ftp://ftp.th.pld-linux.org/dists/th/obsolete/SRPMS/RPMS
+type = rpm-md
+disabled=yes

================================================================
Index: packages/smart/th-ready.channel
diff -u /dev/null packages/smart/th-ready.channel:1.1
--- /dev/null	Sun Jan 22 12:57:39 2012
+++ packages/smart/th-ready.channel	Sun Jan 22 12:57:33 2012
@@ -0,0 +1,23 @@
+[th-ready]
+name = PLD Linux 3.0 (Th) - %ARCH%: ready (testing stage before moved to main)
+baseurl = ftp://ftp.th.pld-linux.org/dists/th/ready/%ARCH%/RPMS/
+type = rpm-md
+disabled=yes
+
+[th-ready-noarch]
+name = PLD Linux 3.0 (Th) - noarch: ready (testing stage before moved to main)
+baseurl = ftp://ftp.th.pld-linux.org/dists/th/ready/noarch/RPMS/
+type = rpm-md
+disabled=yes
+
+[th-ready-debuginfo]
+name = PLD Linux 3.0 (Th) - %ARCH% - debuginfo: ready (testing stage before moved to main)
+baseurl = ftp://ftp.th.pld-linux.org/dists/th/ready/%ARCH%/debuginfo/
+type = rpm-md
+disabled=yes
+
+[th-ready-source]
+name = PLD Linux 3.0 (Th) - SRPMS: ready (testing stage before moved to main)
+baseurl = ftp://ftp.th.pld-linux.org/dists/th/ready/SRPMS/RPMS
+type = rpm-md
+disabled=yes

================================================================
Index: packages/smart/th-test.channel
diff -u /dev/null packages/smart/th-test.channel:1.1
--- /dev/null	Sun Jan 22 12:57:39 2012
+++ packages/smart/th-test.channel	Sun Jan 22 12:57:33 2012
@@ -0,0 +1,23 @@
+[th-test]
+name = PLD Linux 3.0 (Th) - %ARCH%: test (built packages to be moved to ready)
+baseurl = ftp://ftp.th.pld-linux.org/dists/th/test/%ARCH%/RPMS/
+type = rpm-md
+disabled=yes
+
+[th-test-noarch]
+name = PLD Linux 3.0 (Th) - noarch: test (built packages to be moved to ready)
+baseurl = ftp://ftp.th.pld-linux.org/dists/th/test/noarch/RPMS/
+type = rpm-md
+disabled=yes
+
+[th-test-debuginfo]
+name = PLD Linux 3.0 (Th) - %ARCH% - debuginfo: test (built packages to be moved to ready)
+baseurl = ftp://ftp.th.pld-linux.org/dists/th/test/%ARCH%/debuginfo/
+type = rpm-md
+disabled=yes
+
+[th-test-source]
+name = PLD Linux 3.0 (Th) - SRPMS: test (built packages to be moved to ready)
+baseurl = ftp://ftp.th.pld-linux.org/dists/th/test/SRPMS/RPMS
+type = rpm-md
+disabled=yes

================================================================
Index: packages/smart/th.channel
diff -u /dev/null packages/smart/th.channel:1.1
--- /dev/null	Sun Jan 22 12:57:39 2012
+++ packages/smart/th.channel	Sun Jan 22 12:57:33 2012
@@ -0,0 +1,21 @@
+[th]
+name = PLD Linux 3.0 (Th) - %ARCH%
+baseurl = ftp://ftp.th.pld-linux.org/dists/th/PLD/%ARCH%/RPMS/
+type = rpm-md
+
+[th-noarch]
+name = PLD Linux 3.0 (Th) - %ARCH%
+baseurl = ftp://ftp.th.pld-linux.org/dists/th/PLD/noarch/RPMS/
+type = rpm-md
+
+[th-debuginfo]
+name = PLD Linux 3.0 (Th) - %ARCH%
+baseurl = ftp://ftp.th.pld-linux.org/dists/th/PLD/%ARCH%/debuginfo/
+type = rpm-md
+disabled=yes
+
+[th-source]
+name = PLD Linux 3.0 (Th) - %ARCH%
+baseurl = ftp://ftp.th.pld-linux.org/dists/th/PLD/SRPMS/
+type = rpm-md
+disabled=yes
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/smart/smart.spec?r1=1.45&r2=1.46&f=u



More information about the pld-cvs-commit mailing list