kadu.spec, moduł dla xmms

Grzegorz Konopko kolodko1 w wp.pl
Wto, 27 Kwi 2004, 15:49:49 CEST 

Dnia wto 27. kwietnia 2004 14:56, Jakub Bogusz napisał:
> On Tue, Apr 27, 2004 at 02:53:02PM +0200, Grzegorz Konopko wrote:
> > Dnia wto 27. kwietnia 2004 01:25, Maciek Pasternacki napisał:
> > > On Boomtime, Discord 44, 3170 YOLD, Grzegorz Konopko wrote:
> > > > Nie mogłem sobie elegancko poradzic z sekcją %prep.
> > > > Jak to powinno byc zrobione?
> > > 
> > > %setup -T -D -a 1
> > > http://www.rpm.org/max-rpm/s1-rpm-inside-macros.html
> > 
> > Z tego zo wyczytalem to powinno byc mniej wiecej tak:
> > 
> > %prep
> > %setup -q -n %{name}
> > %patch0 -p1
> > %if %{with xmms}
> > %setup  -D -T -b 2 -c %{name}/modules -n %{name}
> > %endif
> > 
> > Ale niestety katalog xmms nie laduje w kadu/modules a w kadu.
> 
> Jeżeli ma być w kadu/modules, to bez %setup:
> tar xzf %{SOURCE2} -C modules

No własnie o to chodzilo.
Czyli %setup nie do tego sluzy bo skladnia wydaje sie poprawna.

Zalanczam wiec poprawiony spec i diff.
Mysle ze mozna to dodac do cvs bo wtyczka jest i tak w domyslnie wylaczonym 
bcondzie.

-------------- następna część ---------
Załącznik, który nie był tekstem został usunięty...
Name: kadu.spec.diff
Type: text/x-diff
Size: 1266 bytes
Desc: nie znany
Url : /mailman/pipermail/pld-devel-pl/attachments/20040626/8039859a/kadu.spec.bin
-------------- następna część ---------
# $Revision: 1.93 $, $Date: 2004/04/20 12:42:25 $
#
%bcond_with     xmms            # with xmms player support module

%define		_libgadu_ver	4:1.4-2
%define		_xmms_mod_ver	1.6
#
Summary:	A Gadu-Gadu client for online messaging
Summary(pl):	Klient Gadu-Gadu do przesyłania wiadomości po sieci
Name:		kadu
Version:	0.3.8
Release:	1.2
License:	GPL
Group:		Applications/Communications
Source0:	http://kadu.net/download/stable/%{name}-%{version}.tar.bz2
# Source0-md5:	773a0abf86904afee6e94e68e578c472
Source1:	%{name}.desktop
Source2:	http://scripts.one.pl/xmms/stable/%{version}/xmms-%{_xmms_mod_ver}.tar.gz
# Source2-md5	7c618ef1a0a1bb76e14c7e2d25685c94
Patch0:		%{name}-ac_am.patch
URL:		http://kadu.net/
BuildRequires:	autoconf
BuildRequires:	automake
BuildRequires:	gettext-devel
BuildRequires:	libgadu-devel >= %{_libgadu_ver}
BuildRequires:	libgsm-devel
BuildRequires:	libtool
BuildRequires:	openssl-devel >= 0.9.7d
BuildRequires:	qt-devel
%{?with_xmms:BuildRequires:     xmms-devel}
BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)

%description
Kadu is client of Gadu-Gadu protocol. It's an IM for Linux and UN*X.
It's written for KDE.

%description -l pl
Kadu jest klientem protkołu Gadu-Gadu. Inaczej mówiąc, jest
komunikatorem dla Linuksa (oraz, przy niewielkim wysiłku, innych
systemów UN*Xowych). Napisano go w oparciu o bibliotekę Qt i KDE,
przeznaczony jest więc dla tego środowiska.

%prep
%setup -q -n %{name}
%patch0 -p1
%if %{with xmms}
tar xzf %{SOURCE2} -C modules
%endif

%build
chmod u+w aclocal.m4 configure
%{__aclocal}
%{__autoheader}
%{__autoconf}
%{__automake}
%configure \
	--enable-voice \
	--enable-dist-info=PLD \
	--with-existing-libgadu=/usr

%{__make}

%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}

%{__make} install \
	DESTDIR=$RPM_BUILD_ROOT

install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}

install kadu/hi48-app-kadu.png $RPM_BUILD_ROOT%{_pixmapsdir}/kadu.png

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(644,root,root,755)
%doc ChangeLog INSTALL README TODO
%attr(755,root,root) %{_bindir}/*
%{_desktopdir}/kadu.desktop
%{_pixmapsdir}/kadu.png
%{_datadir}/%{name}

%define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <feedback w pld-linux.org>
All persons listed below can be reached at <cvs_login>@pld-linux.org

$Log: kadu.spec,v $
Revision 1.93  2004/04/20 12:42:25  krolik
- updated to 0.3.8

Revision 1.92  2004/04/18 16:46:29  blues
- merged fixes from RA, release 3 (rel. 2 reserved for RA)

Revision 1.91  2004/03/19 23:46:27  ankry
- massive change: BR openssl-devel >= 0.9.7d

Revision 1.90  2004/03/19 13:10:20  ankry
- massive change: BR: openssl-devel >= 0.9.6m

Revision 1.89  2004/02/04 15:03:57  pawelb
- up to 0.3.7

Revision 1.88  2004/01/27 11:47:52  erjot
- fix BR/R
- rel up

Revision 1.87  2003/12/01 21:30:33  adgor
- Removed unused applnkdir redefinition

Revision 1.86  2003/11/22 17:27:24  arekm
- updated to 0.3.6

Revision 1.85  2003/11/08 08:10:05  djrzulf
- added TODO,

Revision 1.84  2003/11/06 00:39:28  arekm
- updated to 0.3.5 (enabled voice)

Revision 1.83  2003/11/03 09:16:13  arekm
- rel 2

Revision 1.82  2003/09/30 20:18:24  eothane
- ahh, what the hell: openssl 0.9.7c

Revision 1.81  2003/09/20 11:48:31  arekm
- updated to 0.3.4

Revision 1.80  2003/08/28 08:38:50  ankry
- s/An/A/

Revision 1.79  2003/08/23 18:51:23  arekm
- updated

Revision 1.78  2003/08/19 14:44:35  gotar
- fixed icon installation

Revision 1.77  2003/08/18 08:08:13  gotar
- mass commit: cosmetics (removed trailing white spaces)

Revision 1.76  2003/08/13 20:07:45  adgor
- One icon directly in %%{_pixmapsdir}
- Removed bcond
- Removed BR libpng-devel (redundant)

Revision 1.75  2003/08/13 19:42:49  jack
- added BR qt-devel & libpng-devel

Revision 1.74  2003/08/12 22:32:47  ankry
- cosmetics

Revision 1.73  2003/08/11 22:56:24  maryush
- remove unnecessary br

Revision 1.72  2003/08/09 21:46:49  arekm
- fix config reading with qt 3.2

Revision 1.71  2003/07/12 10:35:56  blues
- added dist info

Revision 1.70  2003/07/12 10:14:21  blues
- cosmetics

Revision 1.69  2003/07/06 15:38:41  deejay1
- up to 0.3.4 rc3

Revision 1.68  2003/06/30 11:18:05  yoshi
- BuildRequires:  libgadu-devel >= 3:1.1

Revision 1.67  2003/06/23 23:27:05  arekm
- require new libgadu

Revision 1.66  2003/06/23 23:22:36  arekm
- updated to rc2

Revision 1.65  2003/06/19 14:25:11  adgor
- Fixed BR

Revision 1.64  2003/06/18 15:21:52  arekm
- updated to rc1

Revision 1.63  2003/06/15 16:05:25  adgor
- "with icondir" bcond
- Release 2

Revision 1.62  2003/05/28 16:51:59  djurban
- use system libgadu
- rebuild ac_am
- fixed openssl checks

Revision 1.61  2003/05/27 15:04:59  adgor
- patch0 already aplied

Revision 1.60  2003/05/27 11:58:22  adgor
- Up to 0.34-pre3

Revision 1.59  2003/05/25 11:00:52  malekith
- massive attack, adding Source-md5

Revision 1.58  2003/05/25 05:49:12  misi3k
- massive attack s/pld.org.pl/pld-linux.org/

Revision 1.57  2003/05/12 20:57:15  misiek
- sometimes do not reconnect

Revision 1.56  2003/05/10 20:00:06  misiek
- updated to pre 2

Revision 1.55  2003/05/05 12:20:47  qboosh
- fixed Epoch in R: libgadu

Revision 1.54  2003/05/04 18:21:33  adgor
- 0.3.4-pre1
- Fixed Requires
- Fixed %%post
- desktop file moved to %%{_desktopdir}

Revision 1.53  2003/04/04 12:13:23  misi3k
- updated to 0.3.3
- rel 1

Revision 1.52  2003/03/26 11:48:51  adgor
- Fixed Req

Revision 1.51  2003/03/20 15:25:48  misiek
- rc4

Revision 1.50  2003/03/14 10:09:34  adgor
- Removed last changes. See a few log lines below!

Revision 1.49  2003/03/13 21:47:51  tjbynum
- now build on ra.

Revision 1.48  2003/03/11 08:56:21  adgor
- Req libgadu >= 20030208
- Removed c/cxx flags (now configure sets it properly)

Revision 1.47  2003/03/10 07:26:54  pascalek
- updated to 0.3.3-rc3

Revision 1.46  2003/03/09 12:14:32  blues
- req. strict openssl + cosmetics

Revision 1.45  2003/02/27 14:37:48  jasio
Fixed small typo

Revision 1.44  2003/02/26 12:17:26  jasio
Moving --with-qt-includes=/usr/X11R6/include/qt to RA-branch

Revision 1.43  2003/02/25 21:52:23  jasio
- Added additional BuildReq - openssl-devel (new version has SSL coding now)
- Changes in configure section - now package is building

Revision 1.42  2003/02/24 11:31:48  adgor
- 0.3.3-rc2

Revision 1.41  2003/02/11 03:33:41  adgor
- Added missing files
- Added %%find_lang macro
- Simplifications

Revision 1.40  2003/02/11 03:16:24  adgor
- 0-3.3-rc1

Revision 1.39  2003/02/02 13:18:08  adgor
- 0.3.3-pre5

Revision 1.38  2003/01/24 08:46:05  qboosh
- missing dir, fixed man page entry in %%files

Revision 1.37  2003/01/24 05:36:01  pascalek
- updated to 0.3.3pre4

Revision 1.36  2003/01/23 14:42:57  adgor
- Added kde_apsdir argument
- Please - do this carefully!

Revision 1.35  2003/01/18 22:51:59  juandon
- removed two lines with define

Revision 1.34  2003/01/10 06:18:12  pascalek
- updated to 0.3.3-pre3

Revision 1.33  2003/01/02 12:55:51  pascalek
- updated to 0.3.3-pre2

Revision 1.32  2002/12/13 09:05:28  pascalek
- updated to 0.3.3 pre1

Revision 1.31  2002/10/20 13:16:48  mmazur
- fixed versioning & respect for %__cc and %__cxx

Revision 1.30  2002/10/20 12:36:13  mmazur
- updated to 20021020 snap and added icons
- no idea if it works though :)

Revision 1.29  2002/10/05 13:00:44  adgor
- Updated to 10021005 (getting personal info works fine)
- Release 7

Revision 1.28  2002/09/19 00:05:03  maryush
- updated to 20020918
- STBR

Revision 1.27  2002/09/09 12:18:02  maryush
- updated to 20020909
- fixed %install (now DESTDIR working correctly)
- fixed %files
- STBR

Revision 1.26  2002/09/06 10:32:32  maryush
- updated to 20020906

Revision 1.25  2002/08/30 13:06:12  maryush
- updated to 20020830
- fixed build (stupid hack :/)
- Blues STBR

Revision 1.24  2002/08/29 23:30:14  blues
- release 2 - some cleanups

Revision 1.23  2002/08/27 16:19:59  maryush
- updated to last snapshot (fixed empty msg)
- fixed homepage url

Revision 1.22  2002/08/15 15:05:18  blues
- 0.3.1 - some cleanups, removed outdated patches

Revision 1.21  2002/08/15 14:37:18  blues
- release 1.1

Revision 1.20  2002/07/30 09:21:36  qboosh
- new %%doc, removed BRs implied by others, added missing dir

Revision 1.19  2002/07/03 09:24:04  wolf
- spelling

Revision 1.18  2002/06/05 20:37:17  mkierus
- change BuildRequires for kde and qt

Revision 1.17  2002/06/05 20:18:29  mkierus
- updated to 0.3.0

Revision 1.16  2002/05/19 18:19:26  adasi
 - added br: Readline-devel

Revision 1.15  2002/04/29 17:20:13  mmazur
- somebody kick the libgadu (s)crew :) needed to turned on statical linking
with libgadu from the kadu tarball because the current snapshot of
libgadu segfaults kadu... stability stability :)
- and btw: rel2; STBR

Revision 1.14  2002/04/26 13:00:06  misiek
- add gcc31 patch (standard C++)

Revision 1.13  2002/04/25 16:40:13  arturs
fixed a small typo

Revision 1.12  2002/04/16 20:37:54  marcus
- added BR libgadu-devel

Revision 1.11  2002/04/05 20:21:25  mmazur
- updated to 0.2.1; rel1; STBR

Revision 1.10  2002/02/22 23:29:05  kloczek
- removed all Group fields translations (our rpm now can handle translating
  Group field using gettext).

Revision 1.9  2002/02/18 12:56:23  gotar
- typos in %post echo.

Revision 1.8  2002/02/16 21:28:33  misiek
- requested by author

Revision 1.7  2002/02/16 21:12:55  misiek
- updated to 0.2.0

Revision 1.6  2002/02/05 16:33:34  gotar
- BuildRequires: libgg-devel -> libgadu-devel
- release 3.

Revision 1.5  2002/01/18 02:13:28  kloczek
perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"

Revision 1.4  2001/12/15 22:49:00  speedy
- fixed. release 2

Revision 1.3  2001/11/29 15:13:25  misiek
- updated to 0.1.9 (nfy)

Revision 1.2  2001/09/29 15:52:08  misiek
- missing make added

Revision 1.1  2001/09/29 15:45:04  misiek
- initial pld release

Więcej informacji o liście dyskusyjnej pld-devel-pl