2005-08-03 Laszlo Peter <[email protected]> Merged changes from HEAD. The following files were affected: ChangeLog: Locally Modified GConf.spec: Locally Modified acroread.spec: Locally Modified apoc-adapter-gconf.spec: Locally Modified apoc.spec: Locally Modified aspell-en.spec: Locally Modified aspell.spec: Locally Modified at-poke.spec: Locally Modified at-spi.spec: Locally Modified atk.spec: Locally Modified blueprint-cursor.spec: Locally Modified blueprint.spec: Locally Modified bootsplash-theme-Sun.spec: Locally Modified bug-buddy.spec: Locally Modified control-center.spec: Locally Modified db_evo.spec: Locally Modified eel.spec: Locally Modified eog.spec: Locally Modified evolution.spec: Locally Modified file-roller.spec: Locally Modified fontconfig.spec: Locally Modified freetts.spec: Locally Modified gail.spec: Locally Modified gaim.spec: Locally Modified gcalctool.spec: Locally Modified gdm.spec: Locally Modified gedit.spec: Locally Modified ggv.spec: Locally Modified gimp.spec: Locally Modified glade.spec: Locally Modified glib2.spec: Locally Modified gnome-applets.spec: Locally Modified gnome-audio.spec: Locally Modified gnome-cups-manager.spec: Locally Modified gnome-desktop.spec: Locally Modified gnome-games.spec: Locally Modified gnome-icon-theme.spec: Locally Modified gnome-im-switcher.spec: Locally Modified gnome-keyring.spec: Locally Modified gnome-mag.spec: Locally Modified gnome-media.spec: Locally Modified gnome-mime-data.spec: Locally Modified gnome-panel.spec: Locally Modified gnome-pilot.spec: Locally Modified gnome-session.spec: Locally Modified gnome-speech.spec: Locally Modified gnome-spell.spec: Locally Modified gnome-system-monitor.spec: Locally Modified gnome-terminal.spec: Locally Modified gnome-themes.spec: Locally Modified gnome-user-docs.spec: Locally Modified gnome-utils.spec: Locally Modified gnome-vfs.spec: Locally Modified gnopernicus.spec: Locally Modified gok.spec: Locally Modified gpdf.spec: Locally Modified gphoto2.spec: Locally Modified gst-plugins.spec: Locally Modified gst.spec: Locally Modified gthumb.spec: Locally Modified gtk-doc.spec: Locally Modified gtk2.spec: Locally Modified gtkam.spec: Locally Modified gtkhtml.spec: Locally Modified gtksourceview.spec: Locally Modified gucharmap.spec: Locally Modified hicolor-icon-theme.spec: Locally Modified ifrestart.spec: Locally Modified j2re-integration.spec: Locally Modified java-access-bridge.spec: Locally Modified javaapps.spec: Locally Modified javahelp-convert.spec: Locally Modified jds-registration.spec: Locally Modified jdshelp.spec: Locally Modified jdstoc.spec: Locally Modified libbonobo.spec: Locally Modified libbonoboui.spec: Locally Modified libexif-gtk.spec: Locally Modified libgail-gnome.spec: Locally Modified libgal.spec: Locally Modified libghttp.spec: Locally Modified libgnome.spec: Locally Modified libgnomecanvas.spec: Locally Modified libgnomecups.spec: Locally Modified libgnomeprint.spec: Locally Modified libgnomeprintui.spec: Locally Modified libgnomeui.spec: Locally Modified libgphoto2.spec: Locally Modified libgtop.spec: Locally Modified libical.spec: Locally Modified libsoup.spec: Locally Modified libwnck.spec: Locally Modified libxklavier.spec: Locally Modified libxslt.spec: Locally Modified liby2util.spec: Locally Modified magicdev.spec: Locally Modified metacity.spec: Locally Modified mozilla.spec: Locally Modified nautilus-cd-burner.spec: Locally Modified nautilus.spec: Locally Modified netapplet.spec: Locally Modified now.spec: Locally Modified ocaml.spec: Locally Added pam-usermode.spec: Locally Modified scrollkeeper.spec: Locally Modified shared-mime-info.spec: Locally Modified steel-theme.spec: Locally Modified sun-gdm-themes.spec: Locally Modified sun-system-settings.spec: Locally Modified ttf-baekmuk.spec: Locally Modified ttf-freefont.spec: Locally Modified unison.spec: Locally Added usermode.spec: Locally Modified vino.spec: Locally Modified vte.spec: Locally Modified webeyes.spec: Locally Modified xscreensaver.spec: Locally Modified yast2-theme-Sun.spec: Locally Modified yast2-trans-cs.spec: Locally Modified yast2-trans-de.spec: Locally Modified yast2-trans-en_GB.spec: Locally Modified yast2-trans-en_US.spec: Locally Modified yast2-trans-es.spec: Locally Modified yast2-trans-fr.spec: Locally Modified yast2-trans-hu.spec: Locally Modified yast2-trans-it.spec: Locally Modified yast2-trans-ja.spec: Locally Modified yast2-trans-ko.spec: Locally Modified yast2-trans-pl.spec: Locally Modified yast2-trans-pt_BR.spec: Locally Modified yast2-trans-ru.spec: Locally Modified yast2-trans-sv.spec: Locally Modified yast2-trans-zh_CN.spec: Locally Modified yast2-trans-zh_HK.spec: Locally Modified yast2-trans-zh_TW.spec: Locally Modified yelp.spec: Locally Modified zenity.spec: Locally Modified SUNWocaml.spec: Locally Added SUNWunison.spec: Locally Added staroffice8-accessibility-icons.tar.gz: Locally Added control-center-37-no-xkb-dialog.diff: Locally Added control-center-38-layout-deletion.diff: Locally Added control-center-39-background-crash.diff: Locally Added control-center-40-xkb-check-remote-login.diff: Locally Added eel-05-cancel-rename.diff: Locally Added eog-07-image-save-as.diff: Locally Added gail-02-model-row-deleted-fix.diff: Locally Added gail-03-garbage-collect-6278812.diff: Locally Added gdm-45-xnest-remote-session.diff: Locally Added gnome-applets-22-gkb-applet-show-message.diff: Locally Added gnome-desktop-01-jds-about-branding.diff: Locally Modified gnome-games-05-g11n-desktop-fix.diff: Locally Added gnome-im-switcher-09-enable-unicode.diff: Locally Added gnome-mime-data-14-return-path-pattern.diff: Locally Added gnome-themes-08-add-so8-a11y-icons.diff: Locally Added gnome-utils-10-searchtool-ceasing.diff: Locally Added gnopernicus-05-immortal-speech.diff: Locally Added gnopernicus-09-table-search-limit.diff: Locally Added gok-01-jds-apps.diff: Locally Modified gok-03-help-input-devices.diff: Locally Added gok-04-menu-doubleaction-patch.diff: Locally Added gok-05-dialog-container-add-children.diff: Locally Added gok-09-no-login-warn-6279448.diff: Locally Added java-access-bridge-01-window-activate.diff: Locally Added libbonoboui-05-nautilus-crash.diff: Locally Added libgnome-03-lockdown-schemas.diff: Locally Modified libgnomeprint-13-PDF-landscape-6263422.diff: Locally Added libgnomeui-10-cancel-rename.diff: Locally Added metacity-12-splash-layer.diff: Locally Added nautilus-46-upgrade-icons-missing.diff: Locally Added nautilus-47-frame-buffer.diff: Locally Added netapplet-04-no-wless-auto.diff: Locally Added usermode-10-protocol.diff: Locally Added vino-08-fix-a11y-hang.diff: Locally Added xscreensaver-13-2scrat.diff: Locally Added

     1

#

     2

# spec file for package zenity

     3

#

     4

# Copyright (c) 2003 Sun Microsystems, Inc.

     5

# This file and all modifications and additions to the pristine

     6

# package are under the same license as the package itself.

     7

#

     8

     9

    10

Name:         zenity

    11

License:      LGPL

    12

Group:        System/GUI/GNOME

    13

Version:      2.10.0

    14

Release:      1

    15

Distribution: Java Desktop System, Release 3

    16

Vendor:       Sun Microsystems, Inc.

    17

Summary:      Show graphical dialog boxes from scripts

    18

Source:       http://ftp.gnome.org/pub/GNOME/sources/zenity/2.10/%{name}-%{version}.tar.bz2

    19

Source1:      l10n-configure.sh

    20

#FIXME: Source2:      zenity-l10n-po-1.16.tar.bz2

    21

Source3:      zenity.1.gz

    22

Source4:      gdialog.1.gz

    23

#FIXME: Source5:      zenity-l10n-online-help-ci-linux-1.2.tar.bz2

    24

#FIXME: Source6:      zenity-docs-0.2.tar.bz2

    25

#FIXME: Source7:      zenity-docs-0.3linux.tar.bz2

    26

Patch1:	      zenity-01-l10n-online-help.diff

    27

Patch2:	      zenity-02-pkgconfig.diff

    28

URL:          http://www.gnome.org

    29

BuildRoot:    %{_tmppath}/%{name}-%{version}-build

    30

Docdir:       %{_defaultdocdir}/%{name}

    31

Autoreqprov:  on

    32

    33

%define gtk2_version 2.3.1

    34

%define libgnomecanvas_version 2.4.0

    35

%define GConf_version 2.4.0.1

    36

%define libglade_version 2.3.1

    37

%define popt_version 1.6.4

    38

%define scrollkeeper_version 0.3.12

    39

    40

Requires:	gtk2 >= %{gtk2_version}

    41

Requires:	libgnomecanvas >= %{libgnomecanvas_version}

    42

Requires:	GConf >= %{GConf_version}

    43

Requires:	libglade >= %{libglade_version}

    44

BuildRequires:  gtk2-devel >= %{gtk2_version}

    45

BuildRequires:  libgnomecanvas-devel >= %{libgnomecanvas_version}

    46

BuildRequires:  GConf-devel >= %{GConf_version}

    47

BuildRequires:  libglade-devel >= %{libglade_version}

    48

BuildRequires:  popt-devel >= %{popt_version}

    49

BuildRequires:  scrollkeeper >= %{scrollkeeper_version}

    50

BuildRequires:  javahelp-convert

    51

    52

%description

    53

Show graphical dialog boxes from the commandline or through scripts. Zenity is a 

    54

predecessor to dialog.

    55

    56

%prep

    57

%setup -q

    58

    59

%ifos solaris

    60

#FIXME: bzcat %SOURCE6 | tar xf -

    61

%else

    62

#FIXME: bzcat %SOURCE7 | tar xf -

    63

%endif

    64

#FIXME: bzcat %SOURCE2 | tar xf -

    65

#FIXME: bzcat %SOURCE5 | tar xf -

    66

#FIXME: %patch1 -p1

    67

%patch2 -p1

    68

    69

bash -x %SOURCE1

    70

    71

%build

    72

%ifos linux

    73

if [ -x /usr/bin/getconf ]; then

    74

  CPUS=`getconf _NPROCESSORS_ONLN`

    75

fi

    76

%else

    77

  CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`

    78

%endif

    79

if test "x$CPUS" = "x" -o $CPUS = 0; then

    80

  CPUS=1

    81

fi

    82

    83

libtoolize --force

    84

aclocal $ACLOCAL_FLAGS 

    85

automake -a -c -f

    86

autoconf

    87

CFLAGS="$RPM_OPT_FLAGS" \

    88

  ./configure \

    89

	--prefix=%{_prefix} \

    90

	--sysconfdir=%{_sysconfdir} \

    91

	--mandir=%{_mandir}

    92

make -j $CPUS

    93

    94

%install

    95

make -i install DESTDIR=$RPM_BUILD_ROOT

    96

install -d $RPM_BUILD_ROOT%{_mandir}/man1

    97

install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1

    98

install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/man1

    99

#Copy zh_HK from zh_TW

   100

#Fixes bug 4930405

   101

install -d $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES

   102

install --mode=0644 $RPM_BUILD_ROOT%{_datadir}/locale/zh_TW/LC_MESSAGES/*.mo $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES/

   103

   104

javahelp-convert-install $RPM_BUILD_ROOT %{name} %{name}.xml

   105

   106

#Remove some scrollkeeper files before packaging

   107

rm -rf $RPM_BUILD_ROOT/%{_prefix}/var

   108

   109

%clean

   110

rm -rf $RPM_BUILD_ROOT

   111

   112

%files

   113

%defattr (-, root, root)

   114

%{_bindir}/*

   115

%{_datadir}/locale/*/LC_MESSAGES/*.mo

   116

%{_datadir}/omf/zenity

   117

%{_datadir}/zenity/*

   118

%{_datadir}/gnome/help

   119

%{_datadir}/gnome/javahelp

   120

%{_mandir}/man1/*

   121

   122

%changelog

   123

* Fri Jul 01 2005 - [email protected]

   124

- Add pkgconfig patch

   125

   126

* Wed Jun 08 2005 - [email protected]

   127

- Fix build. remove scrollkeeper files before packageing

   128

   129

* Tue May 25 2005 - [email protected]

   130

- Fix build.

   131

   132

* Thu May 12 2005 - [email protected]

   133

- Bump to 2.10.0

   134

   135

* Thu Mar 31 2005 - [email protected]

   136

- Updated docs tarball (zenity-docs-0.3linux) from [email protected].

   137

   138

* Fri Jan 14 2005 - [email protected]

   139

- Updated l10n help tarball for cinnabar-linux

   140

   141

* Thu Oct 28 2004 - [email protected]

   142

- Updated l10n help tarball and added pt_BR

   143

   144

* Tue Aug 24 2004 - [email protected]

   145

- fixed man page file list issue

   146

* Fri Aug 20 2004 - [email protected]

   147

- Integrated updated docs tarball from [email protected].

   148

   149

* Thu Aug 05 2004 - [email protected]

   150

- Integrated docs tarball from [email protected]

   151

   152

* Thu Jul 08 2004 - [email protected]

   153

- Updated l10n content to zenity-l10n-po-1.2.tar.bz2

   154

   155

* Wed Jul 07 2004 - [email protected]

   156

- added "-j $CPUS" to make to speed up builds

   157

   158

* Wed Jun  2 2004 - [email protected]

   159

- Added %SOURCE1 to install l10n messages

   160

* Wed May 12 2004 - [email protected]

   161

- Updated l10n content to zenity-l10n-po-1.1.tar.bz2

   162

   163

* Sun Apr 18 2004 - [email protected]

   164

- enable javahelp conversion on Solaris

   165

   166

* Thu Apr 01 2004 - [email protected]

   167

- Javahelp conversion

   168

   169

* Mon Mar 29 2004 - [email protected]

   170

- Updated l10n content to zenity-l10n-po-1.0.tar.bz2

   171

   172

* Tue Mar 23 2004 - [email protected]

   173

- Bump to 2.6.0

   174

   175

* Wed Mar 17 2004 - [email protected]

   176

- re-autotoolize to pick up fixed glib-gettext macros needed on Solaris

   177

   178

* Tue Mar 15 2004 - [email protected]

   179

- Remove man page patch since we do this 

   180

  with %files.

   181

   182

* Tue Feb 24 2004 - [email protected]

   183

- Update tarball to 2.5.2

   184

   185

* Wed Dec 17 2003 - [email protected]

   186

- Update tarball to 1.7

   187

   188

* Mon Oct 13 2003 - [email protected]

   189

- Update tarball

   190

   191

* Mon Aug 11 2003 - [email protected]

   192

- Update tarball

   193

   194

* Fri Jul 25 2003 - [email protected]

   195

- Requires scrollkeeper for postinstall. Add a dependency

   196

   197

* Tue Jul 01 2003 - [email protected]

   198

- Initial Sun release