On Jan 29, 2008 12:12 AM, Patrick Ale <patrick.ale at gmail.com> wrote:
And the same goes for SUNWgnome-ui-designer. There were %files and
%files devel entries in both the SUNWgnome-ui-devel.spec and the
base-spec/glade.spec
Removing the entries from SUNWgnome-ui-devel.spec and mergig with
base-spec/glade.spec solves the problem.
--- SUNWgnome-ui-designer.spec (revision 12898)
+++ SUNWgnome-ui-designer.spec (working copy)
@@ -99,48 +99,6 @@
echo '/usr/bin/scrollkeeper-update'
) | $BASEDIR/lib/postrun -b -u -c JDS
-%files
-%defattr (-, root, bin)
-%dir %attr (0755, root, bin) %{_bindir}
-%{_bindir}/*
-%dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/*.so*
-%{_libdir}/glade*
-%dir %attr (0755, root, sys) %{_datadir}
-%dir %attr (0755, root, other) %{_datadir}/applications
-%{_datadir}/applications/*
-%{_datadir}/glade*
-%dir %attr (0755, root, other) %{_datadir}/gnome
-%{_datadir}/gnome/*
-%{_datadir}/omf
-%dir %attr (0755, root, other) %{_datadir}/icons
-%dir %attr (0755, root, other) %{_datadir}/icons/hicolor
-%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/*
-%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/*/apps
-%{_datadir}/icons/hicolor/*/apps/*
-%dir %attr(0755, root, bin) %{_mandir}
-%dir %attr(0755, root, bin) %{_mandir}/*
-%{_mandir}/*/*
-
-%if %build_l10n
-%files l10n
-%defattr (-, root, bin)
-%dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
-%endif
-
-%files devel
-%defattr (-, root, bin)
-%dir %attr (0755, root, bin) %{_includedir}
-%{_includedir}/*
-%dir %attr (0755, root, bin) %{_libdir}
-%dir %attr (0755, root, other) %{_libdir}/pkgconfig
-%{_libdir}/pkgconfig/*
-%dir %attr (0755, root, sys) %{_datadir}
-%if %{!?_without_gtk_doc:1}%{?_without_gtk_doc:0}
-%{_datadir}/gtk-doc
-%endif
-
%changelog
* Fri Oct 5 2007 - laca at sun.com
- delete unneeded env vars
--- base-specs/glade.spec (revision 12898)
+++ base-specs/glade.spec (working copy)
@@ -85,30 +85,56 @@
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
-%if %{!?_without_gtk_doc:0}%{?_without_gtk_doc:1}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/gtk-doc
-%endif
-
-
%clean
rm -rf $RPM_BUILD_ROOT
%files
%doc AUTHORS COPYING ChangeLog NEWS README
-%defattr (-, root, root)
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_bindir}
%{_bindir}/*
-%{_datadir}/applications
-%{_datadir}/locale/*/LC_MESSAGES/*.mo
-%{_datadir}/icons
-%{_datadir}/omf/*
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/*.so*
+%{_libdir}/glade*
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, other) %{_datadir}/applications
+%{_datadir}/applications/*
+%{_datadir}/glade*
+%dir %attr (0755, root, other) %{_datadir}/gnome
%{_datadir}/gnome/*
-%{_datadir}/glade*
-%{_mandir}/man1/*
+%{_datadir}/omf
+%dir %attr (0755, root, other) %{_datadir}/icons
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/*
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/*/apps
+%{_datadir}/icons/hicolor/*/apps/*
+%dir %attr(0755, root, bin) %{_mandir}
+%dir %attr(0755, root, bin) %{_mandir}/*
+%{_mandir}/*/*
-%defattr(-, root, root)
%{_includedir}/*
%{_libdir}/pkgconfig/*.pc
+%files devel
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_includedir}
+%{_includedir}/*
+%dir %attr (0755, root, bin) %{_libdir}
+%dir %attr (0755, root, other) %{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/*
+%dir %attr (0755, root, sys) %{_datadir}
+%{_datadir}/gtk-doc
+
+%if %build_l10n
+%files l10n
+%defattr (-, root, bin)
+%dir %attr (0755, root, sys) %{_datadir}
+%attr (-, root, other) %{_datadir}/locale
+%endif
+
+
+
%changelog
* Sun Jan 27 2008 - patrick.ale at gmail.com
- Add ifblock to remove gtk-doc when
