diff --git a/.gitignore b/.gitignore index 1a59924..a7aff32 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -rply-1.01.tar.gz -/rply-1.1.1.tar.gz -/rply-1.1.2.tar.gz +/rply-*.tar.gz diff --git a/RPLYConfig.cmake.in b/RPLYConfig.cmake.in index aad66da..5c4ec64 100644 --- a/RPLYConfig.cmake.in +++ b/RPLYConfig.cmake.in @@ -1,6 +1,6 @@ # The RPLY library directory. -SET(RPLY_LIBRARY_DIR "@LIB_INSTALL_DIR@") -SET(RPLY_INCLUDE_DIR "@INCLUDE_INSTALL_DIR@") +SET(RPLY_LIBRARY_DIR "@CMAKE_INSTALL_LIBDIR@") +SET(RPLY_INCLUDE_DIR "@CMAKE_INSTALL_INCLUDEDIR@") SET(RPLY_LIBRARY "@RPLY_LIBRARY@") diff --git a/changelog b/changelog new file mode 100644 index 0000000..664b9a8 --- /dev/null +++ b/changelog @@ -0,0 +1,99 @@ +* Fri Jan 26 2024 Fedora Release Engineering - 1.1.2-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 1.1.2-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 1.1.2-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jan 20 2023 Fedora Release Engineering - 1.1.2-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.1.2-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jan 21 2022 Fedora Release Engineering - 1.1.2-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.1.2-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 1.1.2-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Sep 01 2020 Than Ngo - 1.1.2-17 +- Fixed FTBFS + +* Sat Aug 01 2020 Fedora Release Engineering - 1.1.2-16 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.1.2-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jan 30 2020 Fedora Release Engineering - 1.1.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jul 26 2019 Fedora Release Engineering - 1.1.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 1.1.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 1.1.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 1.1.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 1.1.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.1.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.1.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 1.1.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jun 18 2015 Fedora Release Engineering - 1.1.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Aug 18 2014 Fedora Release Engineering - 1.1.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 1.1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 1.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Mar 04 2013 Mario Ceresa mrceresa@gmail.com rply 1.1.2-1 +- Update to latest upsteam version + +* Thu Feb 14 2013 Fedora Release Engineering - 1.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Nov 27 2012 Richard Hughes - 1.1.1-1 +- Update to latest upstream version. + +* Sat Jul 21 2012 Fedora Release Engineering - 1.01-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 1.01-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Feb 09 2011 Fedora Release Engineering - 1.01-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sun Mar 21 2010 Mario Ceresa mrceresa@gmail.com rply 1.01-3 +- Added CMake modules to detect the package + +* Thu Mar 04 2010 Mario Ceresa mrceresa@gmail.com rply 1.01-2 +- Fixed problems detected in https://bugzilla.redhat.com/show_bug.cgi?id=570258#c2 + +* Wed Mar 03 2010 Mario Ceresa mrceresa@gmail.com rply 1.01-1 +- Initial RPM Release diff --git a/rply.spec b/rply.spec index 4d43285..3ab52e9 100644 --- a/rply.spec +++ b/rply.spec @@ -1,34 +1,40 @@ Name: rply -Version: 1.1.2 -Release: 6%{?dist} +Version: 1.1.4 +Release: %autorelease Summary: A library to read and write PLY files -Group: Development/Libraries License: MIT -URL: http://www.tecgraf.puc-rio.br/~diego/professional/rply/ -Source0: http://www.tecgraf.puc-rio.br/~diego/professional/rply/%{name}-%{version}.tar.gz +URL: https://www.tecgraf.puc-rio.br/~diego/professional/rply/ +Source0: https://www.tecgraf.puc-rio.br/~diego/professional/rply/%{name}-%{version}.tar.gz Source1: rply_CMakeLists.txt Source2: RPLYConfig.cmake.in Source3: rply_cmake_export_cmakelists.txt - -BuildRequires: cmake >= 2.6.0 - +BuildRequires: cmake >= 2.6.0 +BuildRequires: gcc +BuildRequires: gcc-c++ %description RPly is a library that lets applications read and write PLY files. The PLY file format is widely used to store geometric information, such as 3D models, but is general enough to be useful for other purposes. -RPly is easy to use, well documented, small, free, open-source, ANSI C, +RPly is easy to use, well documented, small, free, open-source, ANSI C, efficient, and well tested. The highlights are: * A callback mechanism that makes PLY file input straightforward; * Support for the full range of numeric formats; * Binary (big and little endian) and text modes are fully supported; * Input and output are buffered for efficiency; -* Available under the MIT license for added freedom. +* Available under the MIT license for added freedom. + +%package devel +Summary: Libraries and headers for rply +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +Rply Library Header Files and Link Libraries %prep -%setup -q +%autosetup -p1 # Add CMakeLists.txt file cp %{SOURCE1} CMakeLists.txt @@ -40,90 +46,30 @@ cp %{SOURCE2} CMake/Modules/ cp %{SOURCE3} CMake/export/CMakeLists.txt %build -%cmake -DCMAKE_BUILD_TYPE:STRING="Release"\ - -DCMAKE_VERBOSE_MAKEFILE=ON . +%cmake -DCMAKE_BUILD_TYPE:STRING="Release" \ + -DCMAKE_VERBOSE_MAKEFILE=ON -make %{?_smp_mflags} +%cmake_build iconv -f iso8859-1 -t utf-8 LICENSE > LICENSE.conv && mv -f LICENSE.conv LICENSE %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +%cmake_install + rm $RPM_BUILD_ROOT%{_datadir}/%{name}/rplyConfig.cmake -%clean -rm -rf $RPM_BUILD_ROOT - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - - %files -%defattr(-,root,root,-) -%doc LICENSE +%license LICENSE %doc manual/* %{_libdir}/*.so.* %{_bindir}/* - -%package devel -Summary: Libraries and headers for rply -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description devel - -Rply Library Header Files and Link Libraries - %files devel -%defattr(-,root,root) -%doc LICENSE +%license LICENSE %dir %{_includedir}/%{name}/ %{_includedir}/%{name}/* %{_libdir}/*.so %dir %{_datadir}/%{name}/ %changelog -* Thu Feb 04 2016 Fedora Release Engineering - 1.1.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Jun 18 2015 Fedora Release Engineering - 1.1.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering - 1.1.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 1.1.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 1.1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Mar 04 2013 Mario Ceresa mrceresa@gmail.com rply 1.1.2-1 -- Update to latest upsteam version - -* Thu Feb 14 2013 Fedora Release Engineering - 1.1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Tue Nov 27 2012 Richard Hughes - 1.1.1-1 -- Update to latest upstream version. - -* Sat Jul 21 2012 Fedora Release Engineering - 1.01-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 1.01-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Feb 09 2011 Fedora Release Engineering - 1.01-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sun Mar 21 2010 Mario Ceresa mrceresa@gmail.com rply 1.01-3 -- Added CMake modules to detect the package - -* Thu Mar 04 2010 Mario Ceresa mrceresa@gmail.com rply 1.01-2 -- Fixed problems detected in https://bugzilla.redhat.com/show_bug.cgi?id=570258#c2 - -* Wed Mar 03 2010 Mario Ceresa mrceresa@gmail.com rply 1.01-1 -- Initial RPM Release +%autochangelog diff --git a/rply_CMakeLists.txt b/rply_CMakeLists.txt index a5a36d8..d6d177b 100644 --- a/rply_CMakeLists.txt +++ b/rply_CMakeLists.txt @@ -1,6 +1,8 @@ PROJECT(rply) cmake_minimum_required(VERSION 2.6) +include(GNUInstallDirs) + SET(RPLY_LIB_MAJOR_VERSION 1) SET(RPLY_LIB_MINOR_VERSION 01) @@ -11,7 +13,7 @@ add_library(rply SHARED rply.c ) set_target_properties( rply PROPERTIES VERSION ${RPLY_LIB_MAJOR_VERSION}.${RPLY_LIB_MINOR_VERSION} SOVERSION ${RPLY_LIB_MAJOR_VERSION} - ) + ) include_directories( ${CMAKE_SOURCE_DIR} ) add_executable(rply_convert etc/convert.c ) @@ -25,13 +27,10 @@ target_link_libraries (rply_sconvert rply) install(FILES rply.h DESTINATION include/rply) # Installs the target file -install(TARGETS rply LIBRARY DESTINATION lib${LIB_SUFFIX}) +install(TARGETS rply LIBRARY DESTINATION ${LIBDIR}) install(TARGETS rply_convert RUNTIME DESTINATION bin) install(TARGETS rply_dump RUNTIME DESTINATION bin) install(TARGETS rply_sconvert RUNTIME DESTINATION bin) #This should be the last line of the project SUBDIRS( CMake/export ) - - - diff --git a/rply_cmake_export_cmakelists.txt b/rply_cmake_export_cmakelists.txt index 896696e..1ac475f 100644 --- a/rply_cmake_export_cmakelists.txt +++ b/rply_cmake_export_cmakelists.txt @@ -8,7 +8,7 @@ # Save the compiler settings so another project can import them. INCLUDE(${CMAKE_ROOT}/Modules/CMakeExportBuildSettings.cmake) SET(RPLY_BUILD_SETTINGS_FILE ${rply_BINARY_DIR}/RPLYBuildSettings.cmake) -SET(RPLY_EXPORT_BUILD_SETTINGS_FILE +SET(RPLY_EXPORT_BUILD_SETTINGS_FILE ${CMAKE_INSTALL_PREFIX}/share/rply/cmake/RPLYBuildSettings.cmake ) CMAKE_EXPORT_BUILD_SETTINGS(${RPLY_BUILD_SETTINGS_FILE}) @@ -17,7 +17,7 @@ CMAKE_EXPORT_BUILD_SETTINGS(${RPLY_BUILD_SETTINGS_FILE}) CONFIGURE_FILE(${RPLY_CMAKE_DIR}Modules/RPLYConfig.cmake.in ${CMAKE_BINARY_DIR}/rplyConfig.cmake @ONLY IMMEDIATE) -INSTALL_FILES(/share/rply FILES +INSTALL_FILES(/share/rply FILES ${CMAKE_BINARY_DIR}/rplyConfig.cmake # ${RPLY_BINARY_DIR}/RPLYBuildSettings.cmake # ${RPLY_BINARY_DIR}/RPLYLibraryDepends.cmake diff --git a/sources b/sources index 7092ab6..3503fbb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -708a308377f67824d0722203beed0013 rply-1.1.2.tar.gz +SHA512 (rply-1.1.4.tar.gz) = be389780b8ca74658433f271682d91e89709ced588c4012c152ccf4014557692a1afd37b1bd5e567cedf9c412d42721eb0412ff3331f38717e527bd5d29c27a7