dist-git conversion

Initialize branch F-7 for libXxf86vm
2010-07-29 17:42:21 +00:00 · 2007-05-18 05:54:10 +00:00
5 changed files with 100 additions and 142 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,8 +1 @@
-libXxf86vm-1.1.0.tar.bz2
-/libXxf86vm-1.1.1.tar.bz2
-/libXxf86vm-1.1.2.tar.bz2
-/libXxf86vm-20130524.tar.bz2
-/libXxf86vm-1.1.3.tar.bz2
-/libXxf86vm-1.1.4.tar.bz2
-/libXxf86vm-1.1.5.tar.xz
-/libXxf86vm-1.1.6.tar.xz
+libXxf86vm-1.0.1.tar.bz2
--- a/1
+++ b/1
@ -1 +0,0 @@
-4c4123441e40da97acd10f58911193ad3dcef5cd
--- a/libXxf86vm.spec
+++ b/libXxf86vm.spec
@ -1,164 +1,147 @@
-%global tarball libXxf86vm
-#global gitdate 20130524
-%global gitversion 4c4123441
-
 Summary: X.Org X11 libXxf86vm runtime library
 Name: libXxf86vm
-Version: 1.1.6
-Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
-License: X11-distribute-modifications-variant
+Version: 1.0.1
+Release: 3.1
+License: MIT/X11
+Group: System Environment/Libraries
 URL: http://www.x.org
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

-%if 0%{?gitdate}
-Source0:    %{tarball}-%{gitdate}.tar.bz2
-Source1:    make-git-snapshot.sh
-Source2:    commitid
-%else
-Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.xz
-%endif
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2

-Requires: libX11 >= 1.5.99.902
+BuildRequires: pkgconfig
+BuildRequires: xorg-x11-proto-devel
+BuildRequires: libX11-devel
+BuildRequires: libXext-devel

-BuildRequires: make
-BuildRequires: xorg-x11-util-macros
-BuildRequires: autoconf automake libtool
-BuildRequires: pkgconfig(xext) pkgconfig(xf86vidmodeproto)
-BuildRequires: libX11-devel >= 1.5.99.902
+Obsoletes: XFree86-libs, xorg-x11-libs

 %description
 X.Org X11 libXxf86vm runtime library

 %package devel
 Summary: X.Org X11 libXxf86vm development package
+Group: Development/Libraries
+Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 Requires: %{name} = %{version}-%{release}

+# needed by xxf86vm.pc
+Requires: xorg-x11-proto-devel
+
+Obsoletes: XFree86-devel, xorg-x11-devel
+
 %description devel
 X.Org X11 libXxf86vm development package

 %prep
-%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
+%setup -q
+
+# Disable static library creation by default.
+%define with_static 0

 %build
-autoreconf -v --install --force
-%configure --disable-static
-make %{?_smp_mflags}
+%configure \
+%if ! %{with_static}
+	--disable-static
+%endif
+make

 %install
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+rm -rf $RPM_BUILD_ROOT

+make install DESTDIR=$RPM_BUILD_ROOT

-%ldconfig_post
-%ldconfig_postun
+# We intentionally don't ship *.la files
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig

 %files
-%doc README.md COPYING
+%defattr(-,root,root,-)
+# FIXME: missing some of these files %doc AUTHORS COPYING README INSTALL ChangeLog
+%doc COPYING ChangeLog
 %{_libdir}/libXxf86vm.so.1
 %{_libdir}/libXxf86vm.so.1.0.0

 %files devel
+%defattr(-,root,root,-)
+%if %{with_static}
+%{_libdir}/libXxf86vm.a
+%endif
 %{_libdir}/libXxf86vm.so
 %{_libdir}/pkgconfig/xxf86vm.pc
-%{_mandir}/man3/*.3*
-%{_includedir}/X11/extensions/xf86vmode.h
+#%dir %{_mandir}/man3x
+%{_mandir}/man3/*.3x*

 %changelog
-* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - sh: line 0: fg: no job control
+- rebuild

-* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+* Fri Jun 09 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-3
+- Added "Requires: xorg-x11-proto-devel"
+- Remove package ownership of mandir/libdir/etc.

-* Mon Dec 16 2024 José Expósito <jexposit@redhat.com> - 1.1.6-1
- libXxf86vm 1.1.6
+* Mon Jun 05 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-2
+- Added "BuildRequires: pkgconfig" for (#193509)
+- Use "make install DESTDIR=..." instead of makeinstall macro, to fix (#192731)

-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.5-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+* Thu Apr 27 2006 Adam Jackson <ajackson@redhat.com> 1.0.1-1
+- Update to 1.0.1

-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.5-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> 1.0.0-2.2
+- bump again for double-long bug on ppc(64)

-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> 1.0.0-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes

-* Wed Sep 06 2023 Benjamin Tissoires <benjamin.tissoires@redhat.com> - 1.1.5-4
- SPDX Migration
+* Mon Jan 23 2006 Mike A. Harris <mharris@redhat.com> 1.0.0-2
+- Bumped and rebuilt

-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+* Fri Dec 16 2005 Mike A. Harris <mharris@redhat.com> 1.0.0-1
+- Updated libXxf86vm to version 1.0.0 from X11R7 RC4

-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+* Tue Dec 13 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-1
+- Updated libXxf86vm to version 0.99.2 from X11R7 RC3
+- Added "Requires(pre): xorg-x11-filesystem >= 0.99.2-3", to ensure
+  that /usr/lib/X11 and /usr/include/X11 pre-exist.
+- Removed 'x' suffix from manpage directories to match RC3 upstream.

-* Fri Nov 04 2022 Benjamin Tissoires <benjamin.tissoires@redhat.com> 1.1.5-1
- libXxf86vm 1.1.5-1
+* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
+- rebuilt

-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+* Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-3
+- Changed 'Conflicts: XFree86-devel, xorg-x11-devel' to 'Obsoletes'
+- Changed 'Conflicts: XFree86-libs, xorg-x11-libs' to 'Obsoletes'

-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+* Tue Nov 01 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-2
+- Bump release and rebuild to satiate beehive wonkiness.

-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+* Mon Oct 24 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-1
+- Updated libXxf86vm to version 0.99.1 from X11R7 RC1
+- Updated file manifest to find manpages in "man3x"

-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+* Thu Sep 29 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-3
+- Renamed package to remove xorg-x11 from the name due to unanimous decision
+  between developers.
+- Use Fedora Extras style BuildRoot tag.
+- Disable static library creation by default.
+- Add missing defattr to devel subpackage
+- Add missing documentation files to doc macro

-* Thu Nov  5 12:30:58 AEST 2020 Peter Hutterer <peter.hutterer@redhat.com> - 1.1.4-15
- Add BuildRequires for make
+* Tue Aug 23 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-2
+- Renamed package to prepend "xorg-x11" to the name for consistency with
+  the rest of the X11R7 packages.
+- Added "Requires: %%{name} = %%{version}-%%{release}" dependency to devel
+  subpackage to ensure the devel package matches the installed shared libs.
+- Added virtual "Provides: lib<name>" and "Provides: lib<name>-devel" to
+  allow applications to use implementation agnostic dependencies.
+- Added post/postun scripts which call ldconfig.
+- Added Conflicts with XFree86-libs and xorg-x11-libs to runtime package,
+  and Conflicts with XFree86-devel and xorg-x11-devel to devel package.

-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Jul 05 2018 Adam Jackson <ajax@redhat.com> - 1.1.4-9
- Drop useless %%defattr
-
-* Fri Jun 29 2018 Adam Jackson <ajax@redhat.com> - 1.1.4-8
- Use ldconfig scriptlet macros
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Fri Mar 06 2015 Benjamin Tissoires <benjamin.tissoires@redhat.com> 1.1.4-1
- libXxf86vm 1.1.4
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Fri May 31 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.1.3-1
- libXxf86vm 1.1.3
- Initial build.
+* Mon Aug 22 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-1
+- Initial build.
--- a/make-git-snapshot.sh
+++ b/make-git-snapshot.sh
@ -1,17 +0,0 @@
-#!/bin/sh
-
-DIRNAME=libXxf86vm-$( date +%Y%m%d )
-
-rm -rf $DIRNAME
-git clone git://git.freedesktop.org/git/xorg/lib/libXxf86vm $DIRNAME
-cd $DIRNAME
-if [ -z "$1" ]; then
-    git log | head -1
-else
-    git checkout $1
-fi
-git log | head -1 | awk '{ print $2 }' > ../commitid
-git repack -a -d
-cd ..
-tar jcf $DIRNAME.tar.bz2 $DIRNAME
-rm -rf $DIRNAME
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (libXxf86vm-1.1.6.tar.xz) = 7fb3ac4302eea43b70d5106f6c7a113e28e2807da22d2bb7f040e0c4afd322cad4b7f258a5bd6da3940b6b6b39065e1acb218a6dc0ba06b9dd86ea3849231266
+8de1ca6c55aaad7d8cae19b4f0b3da32  libXxf86vm-1.0.1.tar.bz2
Author	SHA1	Message	Date
Fedora Release Engineering	e72f6a8d10	dist-git conversion	2010-07-29 17:42:21 +00:00
Bill Nottingham	5d6989154b	Initialize branch F-7 for libXxf86vm	2007-05-18 05:54:10 +00:00