From: "Grigory Batalov" <bga@altlinux.org> To: ALT Linux Team development discussions <devel@lists.altlinux.org> Subject: Re: [devel] python chestnut-dialer (was: [cyber] I: Sisyphus-20080212 x86_64 unmets: +25 -207 (720/156)) Date: Tue, 12 Feb 2008 13:56:39 +0300 Message-ID: <20080212135639.69657d45.bga@altlinux.org> (raw) In-Reply-To: <20080212084508.GO1567@osdn.org.ua> [-- Attachment #1.1: Type: text/plain, Size: 836 bytes --] On Tue, 12 Feb 2008 10:45:08 +0200, Michael Shigorin wrote: > > 25 NEW unmet dependencies detected: > > chestnut-dialer-gtk2#0.3.3-alt4.1 python2.5(chestnut_dialer) > > chestnut-dialer-qt#0.3.3-alt4.1 python2.5(chestnut_dialer) > > А что это и с чем его готовить? В этом пакете неверно указаны Provides. Вместо Provides: python2.4(chestnut_dialer) лучше использовать %add_python_lib_path %_datadir/chestnut-dialer/ или хотя бы %py_provides chestnut_dialer К тому же там %post gtk2 не окружён условиями и в configure проще использовать subst_enable (см. патч). Сам зальёшь или мне? > > 207 unmet dependencies have been RESOLVED: > > chestnut-dialer#0.3.3-alt4 python2.4(ConfigParser) > [25 fewer lines] > > chestnut-dialer-qt#0.3.3-alt4 python2.4(qt) -- Grigory Batalov, ALT Linux Team [-- Attachment #1.2: chestnut-dialer-0.3.3.diff --] [-- Type: text/plain, Size: 4365 bytes --] --- chestnut-dialer-0.3.3-alt4.1/chestnut-dialer.spec 2008-02-11 01:37:21 +0000 +++ chestnut-dialer-0.3.3-alt5/chestnut-dialer.spec 2008-02-12 10:48:35 +0000 @@ -4,9 +4,13 @@ %define pamdir %_sysconfdir/pam.d %define consoleappsdir %_sysconfdir/security/console.apps +%def_enable qt +%def_enable gtk2 +%def_with consolehelper + Name: chestnut-dialer Version: 0.3.3 -Release: alt4.1 +Release: alt5 Summary: A PPP dialing program, written in Python License: GPL @@ -24,19 +28,18 @@ Patch6: chestnut-dialer-0.3.3-alt-mtu_mr Patch7: chestnut-dialer-0.3.3-alt-no_resolvconf.patch Packager: Michael Shigorin <mike@altlinux.org> -%{!?_with_gtk2: %{!?_without_gtk2: %define _with_gtk2 1}} -%{!?_with_qt: %{!?_without_qt: %define _with_qt 1}} - Requires: ppp Requires: python >= 2.2 Requires: python-modules-libxml2 PreReq(post,preun): /sbin/install-info %{?_with_consolehelper:Requires: %consolehelper} -# FIXME according to the policy (and remove kluge below)! -Provides: python2.4(chestnut_dialer) +#%%py_provides chestnut_dialer +# Find chestnut_dialer and other provides +%add_python_lib_path %_datadir/chestnut-dialer/ BuildArch: noarch + BuildRequires: ppp BuildRequires: python >= 2.2 BuildRequires: python-modules-libxml2 @@ -41,8 +44,8 @@ BuildRequires: ppp BuildRequires: python >= 2.2 BuildRequires: python-modules-libxml2 BuildRequires: texinfo -%{?_with_gtk2:BuildRequires: python-module-pygtk-libglade} -%{?_with_qt:BuildRequires: python-module-qt} +%{?_enable_gtk2:BuildRequires: python-module-pygtk-libglade} +%{?_enable_qt:BuildRequires: python-module-qt} %{?_with_consolehelper:BuildRequires: %consolehelper} Summary(ru_RU.KOI8-R): ðÒÏÇÒÁÍÍÁ ÄÏÚ×ÏÎÁ ÐÏ ÐÒÏÔÏËÏÌÕ PPP, ÎÁÐÉÓÁÎÎÁÑ ÎÁ Python. @@ -77,7 +80,7 @@ Chestnut Dialer ×ÉËÏÎÕ¤ÔØÓÑ Ú ÐÒÉצÌÅÑÍÉ ÍÏÄÅÍ). Chestnut Dialer ×ÉËÏÒÉÓÔÏ×Õ¤ ÓÔÁÎÄÁÒÔÎÉÊ ÄÅÍÏÎ pppd ÄÌÑ Ú'¤ÄÎÁÎÎÑ Ú ÐÒÏ×ÁÊÄÅÒÏÍ. -%if %{?_with_gtk2:1}%{!?_with_gtk2:0} +%if_enabled gtk2 %package gtk2 Summary: GTK2 user interface for Chestnut Dialer Summary(ru_RU.KOI8-R): éÎÔÅÒÆÅÊÓ ÐÏÌØÚÏ×ÁÔÅÌÑ GTK2 ÄÌÑ Chestnut Dialer. @@ -97,7 +100,7 @@ This is the GTK2 user interface for Ches éÎÔÅÒÆÅÊÓ ËÏÒÉÓÔÕ×ÁÞÁ GTK2 ÄÌÑ Chestnut Dialer. %endif -%if %{?_with_qt:1}%{!?_with_qt:0} +%if_enabled qt %package qt Summary: QT user interface for Chestnut Dialer Summary(ru_RU.KOI8-R): éÎÔÅÒÆÅÊÓ ÐÏÌØÚÏ×ÁÔÅÌÑ QT ÄÌÑ Chestnut Dialer. @@ -129,10 +132,8 @@ This is the QT user interface for Chestn %build %configure \ - %{?_with_gtk2:--enable-gtk2} \ - %{?_without_gtk2:--disable-gtk2} \ - %{?_with_qt:--enable-qt} \ - %{?_without_qt:--disable-qt} \ + %{subst_enable gtk2} \ + %{subst_enable qt} \ --with-pppconfdir=%pppconfdir \ --with-docdir=%docdir \ %{?_with_consolehelper} \ @@ -152,17 +153,21 @@ install -m 0644 chestnut-dialer-qt.deskt %preun %uninstall_info %name.info +%if_enabled gtk2 %post gtk2 %update_menus %postun gtk2 %clean_menus +%endif +%if_enabled qt %post qt %update_menus %postun qt %clean_menus +%endif %files %doc AUTHORS COPYING ChangeLog NEWS* README* FAQ* @@ -171,7 +176,7 @@ install -m 0644 chestnut-dialer-qt.deskt %_man1dir/chestnut-dialer* %pppconfdir/peers/* %_bindir/chestnut-dialer -%if %{?_with_consolehelper:1}%{!?_with_consolehelper:0} +%if_with consolehelper %_sbindir/chestnut-dialer %pamdir/chestnut-dialer %consoleappsdir/chestnut-dialer @@ -185,13 +190,13 @@ install -m 0644 chestnut-dialer-qt.deskt %_datadir/locale/*/LC_MESSAGES/chestnut-dialer.mo %_pixmapsdir/chestnut-dialer.png -%if %{?_with_gtk2:1}%{!?_with_gtk2:0} +%if_enabled gtk2 %files gtk2 %_datadir/chestnut-dialer/chestnut_dialer/gtk2_ui %_datadir/applications/chestnut-dialer-gtk2.desktop %endif -%if %{?_with_qt:1}%{!?_with_qt:0} +%if_enabled qt %files qt %_datadir/chestnut-dialer/chestnut_dialer/qt_ui %_datadir/applications/chestnut-dialer-qt.desktop @@ -204,6 +209,10 @@ install -m 0644 chestnut-dialer-qt.deskt # - check ru.po %changelog +* Tue Feb 12 2008 Michael Shigorin <mike@altlinux.org> 0.3.3-alt5 +- Fix python provides. +- Use %%def_enable/%%if_enabled macros instead of ?_with_. + * Mon Feb 11 2008 Grigory Batalov <bga@altlinux.ru> 0.3.3-alt4.1 - Rebuilt with python-2.5. End of diff Files not compared in chestnut-dialer-0.3.3-alt4.1: chestnut-dialer-0.3.3/ Files not compared in chestnut-dialer-0.3.3-alt5: chestnut-dialer-0.3.3/ [-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2008-02-12 10:56 UTC|newest] Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top 2008-02-12 8:45 ` Michael Shigorin 2008-02-12 10:56 ` Grigory Batalov [this message] 2008-02-12 11:50 ` Michael Shigorin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20080212135639.69657d45.bga@altlinux.org \ --to=bga@altlinux.org \ --cc=devel@lists.altlinux.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
ALT Linux Team development discussions This inbox may be cloned and mirrored by anyone: git clone --mirror http://lore.altlinux.org/devel/0 devel/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 devel devel/ http://lore.altlinux.org/devel \ devel@altlinux.org devel@altlinux.ru devel@lists.altlinux.org devel@lists.altlinux.ru devel@linux.iplabs.ru mandrake-russian@linuxteam.iplabs.ru sisyphus@linuxteam.iplabs.ru public-inbox-index devel Example config snippet for mirrors. Newsgroup available over NNTP: nntp://lore.altlinux.org/org.altlinux.lists.devel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git