rpms/automoc/F-8 .cvsignore, 1.2, 1.3 automoc.spec, 1.1, 1.2 sources, 1.2, 1.3 automoc-1.0-lib64.patch, 1.1, NONE
Kevin Kofler (kkofler)
fedora-extras-commits at redhat.com
Wed Jul 23 12:48:54 UTC 2008
Author: kkofler
Update of /cvs/pkgs/rpms/automoc/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13848/F-8
Modified Files:
.cvsignore automoc.spec sources
Removed Files:
automoc-1.0-lib64.patch
Log Message:
Sync from devel:
* Wed Jul 23 2008 Rex Dieter <rdieter at fedoraproject.org> 1.0-0.8.rc1
- automoc4-0.9.84 (1.0-rc1)
* Mon Jun 30 2008 Rex Dieter <rdieter at fedoraproject.org> 1.0-0.7.beta2
- automoc4-0.9.83 (1.0-beta2)
- drop lib64 patch
* Thu Jun 10 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 1.0-0.5.20080527svn811390
- Leave automoc4.files.in in _libdir
- Same applies to Automoc4Config.cmake
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/automoc/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 1 Jun 2008 10:57:37 -0000 1.2
+++ .cvsignore 23 Jul 2008 12:48:09 -0000 1.3
@@ -1 +1 @@
-automoc-1.0.20080527svn811390.tar.gz
+automoc4-0.9.84.tar.bz2
Index: automoc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/automoc/F-8/automoc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- automoc.spec 1 Jun 2008 10:57:37 -0000 1.1
+++ automoc.spec 23 Jul 2008 12:48:09 -0000 1.2
@@ -1,16 +1,18 @@
-%define snaptag .20080527svn811390
+#define snaptag .20080527svn811390
+%define beta 0.9.84
+%define beta_tag rc1
Name: automoc
Version: 1.0
-Release: 0.3%{?snaptag}%{?dist}
+Release: 0.8.%{?beta_tag}%{?dist}
Summary: KDE4 automoc
Group: Development/Tools
License: BSD
URL: http://www.kde.org
+Source0: ftp://ftp.kde.org/pub/kde/unstable/4.0.94/support/automoc4-%{beta}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: http://rpm.binaryhelix.net/SOURCES/%{name}-%{version}%{?snaptag}.tar.gz
-Patch0: automoc-1.0-lib64.patch
+Provides: automoc4 = %{beta}
Requires: cmake
BuildRequires: cmake qt4-devel kde-filesystem
@@ -20,8 +22,7 @@
%prep
-%setup -q
-%patch0 -p1 -b .lib64
+%setup -q -n automoc4-%{beta}
%build
@@ -30,21 +31,12 @@
%{cmake_kde4} ..
popd
-make %{?_smp_mflags} VERBOSE=1 -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform}
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} -C %{_target_platform}
-# Put things in proper places
-# Put Automoc4Config.cmake in proper place
-%{__mkdir} -p %{buildroot}%{_datadir}/cmake/Modules
-%{__mv} %{buildroot}%{_libdir}/automoc4/Automoc4Config.cmake \
- %{buildroot}%{_datadir}/cmake/Modules/Automoc4Config.cmake
-# Remove automoc4.files.in (and /usr/lib, since it's not needed)
-%{__rm} -rf %{buildroot}%{_libdir}
-
-
%clean
@@ -53,13 +45,22 @@
%files
%defattr(-,root,root,-)
-%doc automoc4.files.in
%{_bindir}/automoc4
-%{_datadir}/cmake/Modules/Automoc4Config.cmake
-
+%{_prefix}/lib/automoc4/
%changelog
+* Wed Jul 23 2008 Rex Dieter <rdieter at fedoraproject.org> 1.0-0.8.rc1
+- automoc4-0.9.84 (1.0-rc1)
+
+* Mon Jun 30 2008 Rex Dieter <rdieter at fedoraproject.org> 1.0-0.7.beta2
+- automoc4-0.9.83 (1.0-beta2)
+- drop lib64 patch
+
+* Thu Jun 10 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 1.0-0.5.20080527svn811390
+- Leave automoc4.files.in in _libdir
+- Same applies to Automoc4Config.cmake
+
* Thu May 29 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 1.0-0.3.20080527svn811390
- Added 'cmake' to Requires
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/automoc/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 1 Jun 2008 10:57:37 -0000 1.2
+++ sources 23 Jul 2008 12:48:09 -0000 1.3
@@ -1 +1 @@
-577b4c8ac4e9ebce24d57af26b1cb337 automoc-1.0.20080527svn811390.tar.gz
+6e1167594b8edd0fd2156aad75b4b2b0 automoc4-0.9.84.tar.bz2
--- automoc-1.0-lib64.patch DELETED ---
More information about the fedora-extras-commits
mailing list