Merge remote branch 'origin/master' into el6

Conflicts:
	.gitignore
	sources
	xforms.spec
This commit is contained in:
Robert Scheck 2015-04-08 16:25:02 +02:00
commit a6e653cfd8
3 changed files with 82 additions and 23 deletions

3
.gitignore vendored
View file

@ -1 +1,2 @@
xforms-1.0.92sp2.tar.gz
/xforms-1.2.?.tar.gz
/xforms-1.2.?.tar.gz.sig

View file

@ -1 +1,2 @@
3c2806dff3022c536eabd93d32e3dab7 xforms-1.0.92sp2.tar.gz
d4414c9eb3b284aa2f603a49f376ed22 xforms-1.2.4.tar.gz
b16dfa7da68a467307295f647392d893 xforms-1.2.4.tar.gz.sig

View file

@ -1,17 +1,13 @@
%define pre sp2
Name: xforms
Summary: XForms toolkit library
Version: 1.0.92
Release: 2.%{pre}%{?dist}
Version: 1.2.4
Release: 2%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
#URL: http://www.nongnu.org/xforms/
URL: http://xforms-toolkit.org/
Source0: http://savannah.nongnu.org/download/xforms/xforms-%{version}%{?pre}.tar.gz
#Source1: http://savannah.nongnu.org/download/xforms/xforms-%{version}%{?pre}.tar.gz.sig
Source0: http://download.savannah.gnu.org/releases-noredirect/xforms/xforms-%{version}%{?pre}.tar.gz
Source1: http://download.savannah.gnu.org/releases-noredirect/xforms/xforms-%{version}%{?pre}.tar.gz.sig
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel
@ -27,21 +23,23 @@ BuildRequires: %{x_deps}
Requires: netpbm-progs
# import eps,ps (optional?)
#Requires: ghostscript
# eww, http://lists.nongnu.org/archive/html/xforms-development/2010-05/msg00000.html
Requires: xorg-x11-fonts-ISO8859-1-75dpi xorg-x11-fonts-ISO8859-1-100dpi
%description
XForms is a GUI toolkit based on Xlib for X Window Systems. It
features a rich set of objects, such as buttons, sliders, and menus
etc. integrated into an easy and efficient object/event callback
execution model that allows fast and easy construction of
X-applications. In addition, the library is extensible and new objects
can easily be created and added to the library.
XForms is a GUI toolkit based on Xlib for X Window Systems. It features a
rich set of objects, such as buttons, sliders, browsers, and menus etc.
integrated into an easy and efficient object/event callback execution model
that allows fast and easy construction of X-applications. In addition, the
library is extensible and new objects can easily be created and added to
the library.
%package devel
Summary: Development files for the XForms toolkit library
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{?x_deps}
%description devel
%{summary}.
@ -64,7 +62,7 @@ make %{?_smp_mflags} X_PRE_LIBS=""
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
## Unpackaged files
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
@ -81,10 +79,12 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc COPYING.LIB Copyright ChangeLog NEWS README
%{_libdir}/libflimage.so.1*
%{_libdir}/libformsGL.so.1*
%{_libdir}/libforms.so.1*
%{!?_licensedir:%global license %%doc}
%license COPYING.LIB Copyright
%doc ChangeLog README
%{_libdir}/libflimage.so.2*
%{_libdir}/libformsGL.so.2*
%{_libdir}/libforms.so.2*
%files devel
%defattr(-,root,root,-)
@ -97,6 +97,64 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Apr 08 2015 Robert Scheck <robert@fedoraproject.org> - 1.2.4-2
- Some minor spec file tweaks
* Wed Apr 08 2015 Robert Scheck <robert@fedoraproject.org> - 1.2.4-1
- Upgrade to 1.2.4
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Wed Jan 15 2014 Rex Dieter <rdieter@fedoraproject.org> 1.2.3-1
- 1.2.3
* Tue Jan 14 2014 Rex Dieter <rdieter@fedoraproject.org> 1.2.2-1
- 1.2.2
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.94-0.10.pre17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.94-0.9.pre17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.0.94-0.8.pre17
- rebuild due to "jpeg8-ABI" feature drop
* Fri Jan 04 2013 Rex Dieter <rdieter@fedoraproject.org> 1.0.94-0.7.pre17
- 1.9.94pre17
* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 1.0.94-0.6.pre12
- rebuild against new libjpeg
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.94-0.5.pre12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Fri Jul 06 2012 Rex Dieter <rdieter@fedoraproject.org> 1.0.94-0.4.pre12
- xforms-1.9.94pre12
* Tue May 15 2012 Rex Dieter <rdieter@fedoraproject.org> 1.0.94-0.3.pre11
- xforms-1.9.94pre11
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.94-0.2.pre5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Mon Aug 15 2011 Rex Dieter <rdieter@fedoraproject.org> 1.0.94-0.1.pre5
- 1.0.94pre5
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.93-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Sun May 23 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.0.93-1
- xforms-1.0.93
* Tue May 18 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.0.93-0.1.pre7
- xforms-1.0.93pre7
- Requires: xorg-x11-fonts-ISO8859-1-75dpi
* Thu Nov 05 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.0.92-2.sp2
- xforms-1.9.92sp2
@ -190,4 +248,3 @@ rm -rf $RPM_BUILD_ROOT
* Mon Jan 20 2003 Rex Dieter <rexdieter at sf.net> 1.0-0
- 1.0-release
- redhat-ize specfile