[Jpackage-commits] dist/james-parent/JPP-6 james-parent.spec, 1.5, 1.6

David Walluck david at ryu.zarb.org
Tue Dec 14 07:35:03 CET 2010


Update of /home/projects/jpackage/cvs/dist/james-parent/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv23625

Modified Files:
	james-parent.spec 
Log Message:
- remove packages which are duplicates of james-project

Index: james-parent.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/james-parent/JPP-6/james-parent.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** james-parent.spec	14 Dec 2010 05:59:43 -0000	1.5
--- james-parent.spec	14 Dec 2010 06:35:01 -0000	1.6
***************
*** 45,49 ****
  Name:           james-parent
  Version:        %{parent_version}
! Release:        1%{?dist}
  Epoch:          0
  Summary:        Apache JAMES Parent POM
--- 45,49 ----
  Name:           james-parent
  Version:        %{parent_version}
! Release:        2%{?dist}
  Epoch:          0
  Summary:        Apache JAMES Parent POM
***************
*** 77,80 ****
--- 77,81 ----
  The Apache JAMES Parent POM.
  
+ %if 0
  %package -n james-project
  Summary:        Apache JAMES Project
***************
*** 85,88 ****
--- 86,90 ----
  %description -n james-project
  The Apache JAMES Project.
+ %endif
  
  %package -n james-maven-skin
***************
*** 99,102 ****
--- 101,105 ----
  Apache JAMES Official Maven2 Site Skin.
  
+ %if 0
  %package -n james-server-root
  Summary:        JAMES Server
***************
*** 108,112 ****
--- 111,117 ----
  %description -n james-server-root
  Apache JAMES Server.
+ %endif
  
+ %if 0
  %package -n james-server-site-%{server_site_real_versiond}
  Summary:        JAMES Server %{server_site_real_version} Documentation
***************
*** 117,120 ****
--- 122,126 ----
  %description -n james-server-site-%{server_site_real_versiond}
  Apache JAMES Server %{server_site_real_version} Documentation.
+ %endif
  
  %if %with repolib
***************
*** 159,178 ****
--- 165,196 ----
  
  %if 0
+ %if 0
  %{__cp} -p maven2-brew/org/apache/james/james-project/%{project_version}/james-project-%{project_version}-site.xml
  %endif
  %{__cp} -p maven2-brew/org/apache/james/james-project/%{project_version}/james-project-%{project_version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-james-project.pom
  %add_to_maven_depmap org.apache.james james-project %{project_version} JPP james-project
+ %else
+ %{__rm} -r  maven2-brew/org/apache/james/james-project
+ %endif
  
  %if 0
+ %if 0
  %{__cp} -p maven2-brew/org/apache/james/james-server-root/%{server_root_version}/james-server-root-%{server_root_version}-site.xml
  %endif
  %{__cp} -p maven2-brew/org/apache/james/james-server-root/%{server_root_version}/james-server-root-%{server_root_version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-james-server-root.pom
  %add_to_maven_depmap org.apache.james james-server-root %{server_root_version} JPP james-server-root
+ %else
+ %{__rm} -r  maven2-brew/org/apache/james/james-server-root
+ %endif
  
  %if 0
+ %if 0
  %{__cp} -p maven2-brew/org/apache/james/james-server-site-%{server_site_real_versiond}/%{server_site_version}/james-server-site-%{server_site_real_versiond}-%{server_site_version}-site.xml
  %endif
  %{__cp} -p maven2-brew/org/apache/james/james-server-site-%{server_site_real_versiond}/%{server_site_version}/james-server-site-%{server_site_real_versiond}-%{server_site_version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-james-server-site-%{server_site_real_versiond}.pom
  %add_to_maven_depmap org.apache.james james-server-site-%{server_site_real_versiond} %{server_site_version} JPP james-server-site-%{server_site_real_versiond}
+ %else
+ %{__rm} -r  maven2-brew/org/apache/james/james-server-site-%{server_site_real_versiond}
+ %endif
  
  %{__cp} -p maven2-brew/org/apache/james/maven-skin/%{maven_skin_version}/maven-skin-%{maven_skin_version}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-james-maven-skin.pom
***************
*** 198,212 ****
--- 216,236 ----
  %{_mavendepmapfragdir}/%{name}
  
+ %if 0
  %files -n james-project
  %defattr(0644,root,root,0755)
  %{_datadir}/maven2/poms/JPP-james-project.pom
+ %endif
  
+ %if 0
  %files -n james-server-root
  %defattr(0644,root,root,0755)
  %{_datadir}/maven2/poms/JPP-james-server-root.pom
+ %endif
  
+ %if 0
  %files -n james-server-site-%{server_site_real_versiond}
  %defattr(0644,root,root,0755)
  %{_datadir}/maven2/poms/JPP-james-server-site-%{server_site_real_versiond}.pom
+ %endif
  
  %files -n james-maven-skin
***************
*** 224,227 ****
--- 248,254 ----
  
  %changelog
+ * Tue Dec 14 2010 David Walluck <dwalluck at redhat.com>  0:1.1-2
+ - remove packages which are duplicates of james-project
+ 
  * Mon Dec 13 2010 David Walluck <dwalluck at redhat.com>  0:1.1-1
  - release




More information about the JPackage-commits mailing list